arm/dts: OMAP: Remove bootargs node from board files
PATCH 2/3 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 <[email protected]>
Cc Grant Likely <[email protected]>
Cc Rob Herring <[email protected]>
--- 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(-)
arch/arm/boot/dts/omap3-beagle.dts +0 -9
@@ -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 */
arch/arm/boot/dts/omap4-panda.dts +0 -9
@@ -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 */
arch/arm/boot/dts/omap4-sdp.dts +0 -9
@@ -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 */
Signature · 1 line
1.7.0.4
PATCH 2/3 arm/dts: OMAP: Remove bootargs node from board files
Benoit,
Quoted 8 lines · Benoit Cousson
Since 3.2, the
CONFIG_ARM_ATAG_DTB_COMPATconfig allows an old bootloader to still use ATAG to provide cmdline.Remove chosen/bootargs from the DTS board files.
Signed-off-by Benoit Cousson <[email protected]>Cc Grant Likely <[email protected]>Cc Rob Herring <[email protected]>
Acked-by Rob Herring <[email protected]>
Rob
Quoted 66 lines
--- 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(-)arch/arm/boot/dts/omap3-beagle.dts +0
-9@@ -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 */arch/arm/boot/dts/omap4-panda.dts +0
-9@@ -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 */arch/arm/boot/dts/omap4-sdp.dts +0
-9@@ -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 */
PATCH 2/3 arm/dts: OMAP: Remove bootargs node from board files
Quoted 6 lines · Rob Herring
Benoit,
Quoted 3 lines · Benoit Cousson
Since 3.2, the
CONFIG_ARM_ATAG_DTB_COMPATconfig allows an old bootloader to still use ATAG to provide cmdline.
Quoted 7 lines
Quoted 5 lines
Remove chosen/bootargs from the DTS board files.
Signed-off-by Benoit Cousson <[email protected]>Cc Grant Likely <[email protected]>Cc Rob Herring <[email protected]>Acked-by Rob Herring <[email protected]>
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
PATCH 2/3 arm/dts: OMAP: Remove bootargs node from board files
In reply to Benoit CoussonQuoted 8 lines · Benoit Cousson
Since 3.2, the
CONFIG_ARM_ATAG_DTB_COMPATconfig allows an old bootloader to still use ATAG to provide cmdline.Remove chosen/bootargs from the DTS board files.
Signed-off-by Benoit Cousson <[email protected]>Cc Grant Likely <[email protected]>Cc Rob Herring <[email protected]>
Acked-by Grant Likely <[email protected]>
Quoted 74 lines
--- 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(-)arch/arm/boot/dts/omap3-beagle.dts +0
-9@@ -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 */arch/arm/boot/dts/omap4-panda.dts +0
-9@@ -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 */arch/arm/boot/dts/omap4-sdp.dts +0
-9@@ -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 */Signature · 7 lines
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