diff options
author | Benoit Cousson <b-cousson@ti.com> | 2011-12-06 11:49:08 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-12-13 17:45:26 -0500 |
commit | fb49b8c22dbb1c48b9f3906af1308c0fa4d7aa82 (patch) | |
tree | 9d683e5da9df9fa4cc747d25ee89ffc2cc08fb40 | |
parent | b755706cd726e5d465c28c2cd64c618419034981 (diff) |
arm/dts: OMAP: Remove bootargs node from board files
Since 3.2, the CONFIG_ARM_ATAG_DTB_COMPAT config allows
an old bootloader to still use ATAG to provide cmdline.
Remove chosen/bootargs from the DTS board files.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/omap3-beagle.dts | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-panda.dts | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-sdp.dts | 9 |
3 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 9486be62bcd..9f72cd4cf30 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts | |||
@@ -13,15 +13,6 @@ | |||
13 | model = "TI OMAP3 BeagleBoard"; | 13 | model = "TI OMAP3 BeagleBoard"; |
14 | compatible = "ti,omap3-beagle", "ti,omap3"; | 14 | compatible = "ti,omap3-beagle", "ti,omap3"; |
15 | 15 | ||
16 | /* | ||
17 | * Since the initial device tree board file does not create any | ||
18 | * devices (MMC, network...), the only way to boot is to provide a | ||
19 | * ramdisk. | ||
20 | */ | ||
21 | chosen { | ||
22 | bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug earlyprintk"; | ||
23 | }; | ||
24 | |||
25 | memory { | 16 | memory { |
26 | device_type = "memory"; | 17 | device_type = "memory"; |
27 | reg = <0x80000000 0x20000000>; /* 512 MB */ | 18 | reg = <0x80000000 0x20000000>; /* 512 MB */ |
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index c7026578ce7..9755ad5917f 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts | |||
@@ -13,15 +13,6 @@ | |||
13 | model = "TI OMAP4 PandaBoard"; | 13 | model = "TI OMAP4 PandaBoard"; |
14 | compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; | 14 | compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; |
15 | 15 | ||
16 | /* | ||
17 | * Since the initial device tree board file does not create any | ||
18 | * devices (MMC, network...), the only way to boot is to provide a | ||
19 | * ramdisk. | ||
20 | */ | ||
21 | chosen { | ||
22 | bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug"; | ||
23 | }; | ||
24 | |||
25 | memory { | 16 | memory { |
26 | device_type = "memory"; | 17 | device_type = "memory"; |
27 | reg = <0x80000000 0x40000000>; /* 1 GB */ | 18 | reg = <0x80000000 0x40000000>; /* 1 GB */ |
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 066e28c9032..63c6b2b2bf4 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts | |||
@@ -13,15 +13,6 @@ | |||
13 | model = "TI OMAP4 SDP board"; | 13 | model = "TI OMAP4 SDP board"; |
14 | compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4"; | 14 | compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4"; |
15 | 15 | ||
16 | /* | ||
17 | * Since the initial device tree board file does not create any | ||
18 | * devices (MMC, network...), the only way to boot is to provide a | ||
19 | * ramdisk. | ||
20 | */ | ||
21 | chosen { | ||
22 | bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug"; | ||
23 | }; | ||
24 | |||
25 | memory { | 16 | memory { |
26 | device_type = "memory"; | 17 | device_type = "memory"; |
27 | reg = <0x80000000 0x40000000>; /* 1 GB */ | 18 | reg = <0x80000000 0x40000000>; /* 1 GB */ |