common: Move CONFIG_BOOTARGS to Kconfig

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

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 3635add..e47f06b 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -60,11 +60,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_NAND
-
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_CS6
@@ -89,14 +84,10 @@
 
 /* Ethernet */
 #define CONFIG_MACB
-#define CONFIG_PHYLIB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_AT91_WANTS_COMMON_PHY
 
-/* USB */
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     2
-
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
@@ -107,7 +98,6 @@
 #define CONFIG_SYS_LOAD_ADDR   ATMEL_BASE_CS6
 
 /* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              0x100000
 #define CONFIG_ENV_OFFSET_REDUND       0x180000
 #define CONFIG_ENV_SIZE                        SZ_128K
@@ -115,12 +105,6 @@
 #define CONFIG_BOOTCOMMAND                                             \
        "nand read 0x70000000 0x200000 0x300000;"                       \
        "bootm 0x70000000"
-#define CONFIG_BOOTARGS                                                        \
-       "console=ttyS0,115200 earlyprintk "                             \
-       "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"          \
-       "256k(env),256k(env_redundant),256k(spare),"                    \
-       "512k(dtb),6M(kernel)ro,-(rootfs) "                             \
-       "root=/dev/mtdblock7 rw rootfstype=jffs2"
 
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16