* [PATCH 2/3] arm/dts: OMAP: Remove bootargs node from board files
@ 2011-12-06 16:49 ` Benoit Cousson
0 siblings, 0 replies; 8+ messages in thread
From: Benoit Cousson @ 2011-12-06 16:49 UTC (permalink / raw)
To: linux-arm-kernel
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>
Cc: Rob Herring <rob.herring@calxeda.com>
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] arm/dts: OMAP: Remove bootargs node from board files
2011-12-06 16:49 ` Benoit Cousson
@ 2011-12-06 18:06 ` Rob Herring
-1 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2011-12-06 18:06 UTC (permalink / raw)
To: Benoit Cousson
Cc: tony, devicetree-discuss, linux-omap, linux-arm-kernel,
Grant Likely
Benoit,
On 12/06/2011 10:49 AM, 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@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Rob
> ---
> 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 */
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/3] arm/dts: OMAP: Remove bootargs node from board files
@ 2011-12-06 18:06 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2011-12-06 18:06 UTC (permalink / raw)
To: linux-arm-kernel
Benoit,
On 12/06/2011 10:49 AM, 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@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Rob
> ---
> 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 */
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] arm/dts: OMAP: Remove bootargs node from board files
2011-12-06 18:06 ` Rob Herring
@ 2011-12-09 0:55 ` Tony Lindgren
-1 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2011-12-09 0:55 UTC (permalink / raw)
To: Rob Herring
Cc: Benoit Cousson, devicetree-discuss, linux-omap, linux-arm-kernel,
Grant Likely
* Rob Herring <robherring2@gmail.com> [111206 09:35]:
> Benoit,
>
> On 12/06/2011 10:49 AM, 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@ti.com>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> > Cc: Rob Herring <rob.herring@calxeda.com>
>
> Acked-by: Rob Herring <rob.herring@calxeda.com>
Thanks applying patches 1 & 2 into omap dt branch.
Still wondering if we should combine patch 3 into
some other cleanup to avoid extra churn..
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] arm/dts: OMAP: Remove bootargs node from board files
@ 2011-12-09 0:55 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2011-12-09 0:55 UTC (permalink / raw)
To: linux-arm-kernel
* Rob Herring <robherring2@gmail.com> [111206 09:35]:
> Benoit,
>
> On 12/06/2011 10:49 AM, 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@ti.com>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> > Cc: Rob Herring <rob.herring@calxeda.com>
>
> Acked-by: Rob Herring <rob.herring@calxeda.com>
Thanks applying patches 1 & 2 into omap dt branch.
Still wondering if we should combine patch 3 into
some other cleanup to avoid extra churn..
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] arm/dts: OMAP: Remove bootargs node from board files
2011-12-06 16:49 ` Benoit Cousson
@ 2012-01-04 20:08 ` Grant Likely
-1 siblings, 0 replies; 8+ messages in thread
From: Grant Likely @ 2012-01-04 20:08 UTC (permalink / raw)
To: Benoit Cousson
Cc: tony, devicetree-discuss, Rob Herring, linux-omap,
linux-arm-kernel
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@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> 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@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/3] arm/dts: OMAP: Remove bootargs node from board files
@ 2012-01-04 20:08 ` Grant Likely
0 siblings, 0 replies; 8+ messages in thread
From: Grant Likely @ 2012-01-04 20:08 UTC (permalink / raw)
To: linux-arm-kernel
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@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> 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 at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread