From 5abc1a4523a5509ce37bc3ec818b660a48f4eafd Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Mon, 14 Aug 2017 20:22:17 +0300 Subject: common: Move CONFIG_BOOTARGS to Kconfig Also introduce CONFIG_USE_BOOTARGS option so we can control if CONFIG_BOOTARGS defined at all. Signed-off-by: Sam Protsenko [trini: Resync r8a779[56]_ulcb, various ls10xx targets] Signed-off-by: Tom Rini --- include/configs/at91sam9260ek.h | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'include/configs/at91sam9260ek.h') diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 8238dcc78fc..92add6219fc 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -129,10 +129,6 @@ #define CONFIG_BOOTCOMMAND "sf probe 0:0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) " \ - "rw rootfstype=jffs2" #elif CONFIG_SYS_USE_DATAFLASH_CS1 @@ -143,10 +139,6 @@ #define CONFIG_BOOTCOMMAND "sf probe 0:1; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) " \ - "rw rootfstype=jffs2" #elif defined(CONFIG_SYS_USE_NANDFLASH) @@ -155,12 +147,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" -#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" #else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ @@ -171,12 +157,6 @@ #define CONFIG_BOOTCOMMAND \ "fatload mmc 0:1 0x22000000 uImage; bootm" -#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/mmcblk0p2 rw rootfstype=ext4 rootwait" #endif #define CONFIG_SYS_CBSIZE 256 -- cgit v1.2.3