On Tue, Dec 06, 2011 at 05:49:08PM +0100, Benoit Cousson wrote:
> 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@xxxxxx>
> Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
> Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
> ---
> arch/arm/boot/dts/omap3-beagle.dts | 9 ---------
> arch/arm/boot/dts/omap4-panda.dts | 9 ---------
> 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 9486be6..9f72cd4 100644
> --- a/arch/arm/boot/dts/omap3-beagle.dts
> +++ b/arch/arm/boot/dts/omap3-beagle.dts
> @@ -13,15 +13,6 @@
> model = "TI OMAP3 BeagleBoard";
> compatible = "ti,omap3-beagle", "ti,omap3";
>
> - /*
> - * Since the initial device tree board file does not create any
> - * devices (MMC, network...), the only way to boot is to provide a
> - * ramdisk.
> - */
> - chosen {
> - bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug earlyprintk";
> - };
> -
> memory {
> device_type = "memory";
> reg = <0x80000000 0x20000000>; /* 512 MB */
> diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
> index c702657..9755ad5 100644
> --- a/arch/arm/boot/dts/omap4-panda.dts
> +++ b/arch/arm/boot/dts/omap4-panda.dts
> @@ -13,15 +13,6 @@
> model = "TI OMAP4 PandaBoard";
> compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4";
>
> - /*
> - * Since the initial device tree board file does not create any
> - * devices (MMC, network...), the only way to boot is to provide a
> - * ramdisk.
> - */
> - chosen {
> - bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug";
> - };
> -
> memory {
> device_type = "memory";
> reg = <0x80000000 0x40000000>; /* 1 GB */
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 066e28c..63c6b2b 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -13,15 +13,6 @@
> model = "TI OMAP4 SDP board";
> compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";
>
> - /*
> - * Since the initial device tree board file does not create any
> - * devices (MMC, network...), the only way to boot is to provide a
> - * ramdisk.
> - */
> - chosen {
> - bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug";
> - };
> -
> memory {
> device_type = "memory";
> reg = <0x80000000 0x40000000>; /* 1 GB */
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
