Convert CONFIG_PCI_GT64120 to Kconfig

[platform/kernel/u-boot.git] / include / configs / siemens-am33x-common.h

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5dc09fa..d2d4296 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -17,11 +17,7 @@
 
 /* commands to include */
 
-#ifndef CONFIG_SPL_BUILD
 #define CONFIG_ROOTPATH                "/opt/eldk"
-#endif
-
-#define CONFIG_SYS_AUTOLOAD    "yes"
 
 /* Clock Defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
@@ -81,16 +77,12 @@
  * we don't need to do it twice.
  */
 
-#ifndef CONFIG_SPL_BUILD
-
 /* USB DRACO ID as default */
 #define CONFIG_USBD_HS
 
 /* USB Device Firmware Update support */
 #define DFU_MANIFEST_POLL_TIMEOUT      25000
 
-#endif /* CONFIG_SPL_BUILD */
-
 /*
  * Default to using SPI for environment, etc.  We have multiple copies
  * of SPL as the ROM will check these locations.
@@ -218,7 +210,7 @@
        "nand_active_ubi_vol=rootfs_a\0" \
        "nand_active_ubi_vol_A=rootfs_a\0" \
        "nand_active_ubi_vol_B=rootfs_b\0" \
-       "nand_root_fs_type=ubifs rootwait=1\0" \
+       "nand_root_fs_type=ubifs rootwait\0" \
        "nand_src_addr=0x280000\0" \
        "nand_src_addr_A=0x280000\0" \
        "nand_src_addr_B=0x780000\0" \
@@ -295,7 +287,7 @@
        "nand_active_ubi_vol=rootfs_a\0" \
        "rootfs_name=rootfs\0" \
        "kernel_name=uImage\0"\
-       "nand_root_fs_type=ubifs rootwait=1\0" \
+       "nand_root_fs_type=ubifs rootwait\0" \
        "nand_args=run bootargs_defaults;" \
                "mtdparts default;" \
                "setenv ${partitionset_active} true;" \