diff options
| author | Andy Green <andy.green@linaro.org> | 2012-05-17 17:17:49 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-05-17 17:17:49 +0800 |
| commit | accac34e1cd4bf0f7e22d1a50c77ee803bc28400 (patch) | |
| tree | 9a5723a59b03678a45b896195fc4ca78a81c592f | |
| parent | 40777491546197eb5a0bd332030cc48b7979ddb2 (diff) | |
omap5 align to new omap5 panda dts namingfor-vikram
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/omap5-panda.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap5-uevm.dts | 29 |
2 files changed, 1 insertions, 30 deletions
diff --git a/arch/arm/boot/dts/omap5-panda.dts b/arch/arm/boot/dts/omap5-panda.dts index b1f8221d6d5..57900d7ca5f 100644 --- a/arch/arm/boot/dts/omap5-panda.dts +++ b/arch/arm/boot/dts/omap5-panda.dts @@ -14,7 +14,7 @@ compatible = "ti,omap5-panda", "ti,omap5432", "ti,omap5"; chosen { - bootargs = "console=ttyO2,115200n8 no_console_suspend debug"; + bootargs = "root=/dev/mmcblk1p2 rw rootwait earlyprintk=1 earlycon=ttyO2,115200n8 console=ttyO2,115200n8 loglevel=8"; }; memory { diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts deleted file mode 100644 index 1fb3b49b6a8..00000000000 --- a/arch/arm/boot/dts/omap5-uevm.dts +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -/dts-v1/; - -/include/ "skeleton.dtsi" - -/ { - model = "TI OMAP5 uEVM"; - compatible = "ti,omap5-uevm", "ti,omap5432", "ti,omap5"; - - chosen { - bootargs = "root=/dev/mmcblk1p2 rw rootwait earlyprintk=1 earlycon=ttyO2,115200n8 console=ttyO2,115200n8 loglevel=8"; - }; - - chosen_emmc { - bootargs = "root=/dev/mmcblk0p2 rw rootwait console=ttyO2,115200n8 loglevel=4"; - }; - - memory { - device_type = "memory"; - reg = <0x80000000 0x40000000>; /* 1 GB */ - }; -}; - |