mpc83xx: Migrate CONFIG_SYS_{BR, OR}*_PRELIM to Kconfig

[platform/kernel/u-boot.git] / include / configs / theadorable-x86-common.h

diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index 144ef91..e0a033b 100644 (file)
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -20,11 +19,6 @@
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 
-#define CONFIG_USB_ETHER_ASIX
-#define CONFIG_USB_ETHER_SMSC95XX
-#define CONFIG_USB_ETHER_MCS7830
-#define CONFIG_USB_ETHER_RTL8152
-
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
 #define CONFIG_CMD_BMP
@@ -51,7 +45,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),"      \
@@ -63,38 +57,45 @@
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"      \
        "addmisc=setenv bootargs ${bootargs} "                  \
                "intel-spi.writeable=1 vmalloc=300M "           \
-               "pci=realloc=on,hpmemsize=0x12000000\0"         \
+               "pci=realloc=on,hpmemsize=0,hpiosize=0\0"       \
        "bootcmd=if env exists recovery_status;"                \
                "then run swupdate;"                            \
                "else run yocto_boot;run swupdate;"             \
                "fi\0"                                          \
+       "setroot=part uuid scsi 0:${partnr} uuid;"              \
+               "setenv root PARTUUID=${uuid}\0"                \
+       "setroot_ubuntu=setenv partnr ${ubuntu_part};run setroot\0" \
+       "setroot_yocto=setenv partnr ${yocto_part};run setroot\0" \
        "ubuntu_args=setenv bootargs "                          \
-               "root=/dev/sda${ubuntu_part} ro\0"              \
+               "root=${root} ro\0"                             \
        "ubuntu_args_quiet=setenv bootargs "                    \
-               "root=/dev/sda${ubuntu_part} ro quiet\0"        \
+               "root=${root} 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"      \
-       "ubuntu_boot=run ubuntu_args_quiet addmtd addmisc "     \
-               "ubuntu_load boot\0"                            \
-       "ubuntu_boot_console=run ubuntu_args addtty_ubuntu "    \
+               "/boot/initrd.img-${kernel-ver}\0"              \
+       "ubuntu_boot=run setroot_ubuntu ubuntu_args_quiet "     \
                "addmtd addmisc ubuntu_load boot\0"             \
-       "net_args=setenv bootargs root=/dev/sda${ubuntu_part} ro\0" \
-       "net_boot=run start_eth net_args addtty_yocto addmtd addmisc;" \
+       "ubuntu_boot_console=run setroot_ubuntu ubuntu_args "   \
+               "addtty_ubuntu addmtd addmisc ubuntu_load boot\0" \
+       "net_args=setenv bootargs root=${root} ro\0"            \
+       "net_boot=run start_eth setroot_ubuntu net_args "       \
+               "addtty_ubuntu 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"                             \
-       "yocto_args_fast=setenv bootargs root=/dev/sda${yocto_part} " \
+       "yocto_args=setenv bootargs root=${root} "              \
+               "panic=1\0"                                     \
+       "yocto_args_fast=setenv bootargs root=${root} "         \
                "quiet panic=1\0"                               \
-       "yocto_boot=run yocto_args addmtd addmisc addtty_yocto;" \
+       "yocto_boot=run setroot_yocto yocto_args addmtd addmisc " \
+               "addtty_yocto;" \
                "if run yocto_load;then zboot 03000000;fi\0"    \
-       "yocto_boot_fast=run yocto_args_fast addmtd addmisc "   \
-               "addtty_yocto yocto_load;zboot 03000000\0"      \
-       "yocto_boot_tftp=run yocto_args addmtd addmisc addtty_yocto " \
+       "yocto_boot_fast=run setroot_yocto yocto_args_fast addmtd " \
+               "addmisc addtty_yocto yocto_load;zboot 03000000\0" \
+       "yocto_boot_tftp=run setroot_yocto yocto_args addmtd "  \
+               "addmisc addtty_yocto "                         \
                "start_eth yocto_load_tftp;zboot 03000000\0"    \
        "yocto_kernel=bzImage\0"                                \
        "yocto_load=load scsi 0:${yocto_part} 03000000 "        \