Convert CONFIG_PCI_GT64120 to Kconfig

[platform/kernel/u-boot.git] / include / configs / chiliboard.h

diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index ad1cd86..97adb83 100644 (file)
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -13,14 +13,12 @@
 #define V_SCLK                         (V_OSCK)
 
 #define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} ${optargs} " \
                "${mtdparts} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
        "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system\0" \
-       "nandrootfstype=ubifs rootwait=1\0" \
+       "nandrootfstype=ubifs rootwait\0" \
        "nandboot=echo Booting from nand ...; " \
                "run nandargs; " \
                "nand read ${fdt_addr} NAND.u-boot-spl-os; " \
@@ -106,9 +104,6 @@
 #define CONFIG_SYS_NS16550_COM5                0x481a8000      /* UART4 */
 #define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65217
-
 /* SPL */
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_BE