x86: theadorable-x86-common: Move "-generic" into kernel-ver variable

This enables the easier usage of "-custom" kernel versions as well.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index 7621385fa2f0aaef6dd967374c89872850ae0750..c20803c5351e96053e9c01530d9cc3bbfc821981 100644 (file)
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -46,7 +46,7 @@
        "yocto_tty=" __stringify(DEF_ENV_YOCTO_TTY) "\0"        \
        "start_eth=if test -n \"${eth_init}\";"                 \
                "then run eth_init;else sleep 0;fi\0"           \
-       "kernel-ver=4.8.0-54\0"                                 \
+       "kernel-ver=4.8.0-54-generic\0"                         \
        "boot=zboot 03000000 0 04000000 ${filesize}\0"          \
        "mtdparts=mtdparts=intel-spi:4k(descriptor),7084k(me)," \
                "8k(env1),8k(env2),64k(mrc),640k(u-boot),"      \
@@ -69,9 +69,9 @@
        "ubuntu_args_quiet=setenv bootargs "                    \
                "root=/dev/sda${ubuntu_part} ro quiet\0"        \
        "ubuntu_load=load scsi 0:${ubuntu_part} 03000000 "      \
-               "/boot/vmlinuz-${kernel-ver}-generic;"          \
+               "/boot/vmlinuz-${kernel-ver};"                  \
                "load scsi 0:${ubuntu_part} 04000000 "          \
-               "/boot/initrd.img-${kernel-ver}-generic\0"      \
+               "/boot/initrd.img-${kernel-ver}\0"              \
        "ubuntu_boot=run ubuntu_args_quiet addmtd addmisc "     \
                "ubuntu_load boot\0"                            \
        "ubuntu_boot_console=run ubuntu_args addtty_ubuntu "    \
@@ -80,7 +80,7 @@
        "net_boot=run start_eth net_args addtty_yocto addmtd addmisc;" \
                "tftp 03000000 ${tftpdir}/bzImage;"             \
                "load scsi 0:${ubuntu_part} 04000000 "          \
-               "/boot/initrd.img-${kernel-ver}-generic;"       \
+               "/boot/initrd.img-${kernel-ver};"               \
                "run boot\0"                                    \
        "yocto_args=setenv bootargs root=/dev/sda${yocto_part} " \
                "panic=1\0"                             \