| Message ID | 1373579559-5697-4-git-send-email-nm@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
With the latest transition to device tree, there is a need to simplify
the load of device tree depending on board type etc. While at it, simplify
few other changes as well.
Testing:
with a uEnv.txt as:
bootdir=/
bootpart=0:1
The following were the boot results:
Beagle (rev C1D): http://pastebin.com/fMdsKkgr
Beagle XM (rev C1): http://pastebin.com/p1zp9AhG
Changes in V2 since v1:
- removed xMB version support based on review comments.
http://marc.info/?t=137357970500004&r=1&w=2&n=5
V1: http://marc.info/?l=u-boot&m=137357963227510&w=2
Nishanth Menon (6):
omap3_beagle: remove JFFS2 support.
omap3_beagle: replace uImage.beagle with generic uImage
beagleboard: remove RevB support for BeagleBoard Xm
omap3_beagle: enable CMD_FS_GENERIC and simplify load of
image/ramdisk
omap3_beagle: support findfdt and loadfdt for devicetree support
omap3_beagle: support booting from zImage and device tree as last
option
board/ti/beagle/beagle.c | 28 ++++++------------------
board/ti/beagle/beagle.h | 3 +--
include/configs/omap3_beagle.h | 46 ++++++++++++++++++++++++++++------------
3 files changed, 41 insertions(+), 36 deletions(-)
Regards,
Nishanth Menon
On Thu, Jul 11, 2013 at 05:33:19PM -0500, Nishanth Menon wrote: > With the latest transition to device tree, there is a need to simplify > the load of device tree depending on board type etc. While at it, simplify > few other changes as well. > > Testing: > with a uEnv.txt as: > bootdir=/ > bootpart=0:1 > > The following were the boot results: > Beagle (rev C1D): http://pastebin.com/fMdsKkgr > Beagle XM (rev C1): http://pastebin.com/p1zp9AhG > > > Changes in V2 since v1: > - removed xMB version support based on review comments. > http://marc.info/?t=137357970500004&r=1&w=2&n=5 > > V1: http://marc.info/?l=u-boot&m=137357963227510&w=2 I have no new comments on the series, awaiting V3 Monday'ish, thanks!
With the latest transition to device tree, there is a need to simplify
the load of device tree depending on board type etc. While at it, simplify
few other changes as well.
Testing:
with a uEnv.txt as:
bootdir=/
bootpart=0:1
The following were the boot results:
Beagle (rev C1D): http://pastebin.com/fMdsKkgr
Beagle XM (rev C1): http://pastebin.com/p1zp9AhG
Changes in V3 since v2:
- Minor fixes for RevB beagleboard DVIpup handling
http://marc.info/?t=137357970500004&r=1&w=2
- Picked up acked-by from http://marc.info/?t=137357970700007&r=1&w=2
V2: http://marc.info/?l=u-boot&m=137358206228251&w=2
V1: http://marc.info/?l=u-boot&m=137357963227510&w=2
Nishanth Menon (6):
omap3_beagle: remove JFFS2 support.
omap3_beagle: replace uImage.beagle with generic uImage
beagleboard: remove RevB support for BeagleBoard Xm
omap3_beagle: enable CMD_FS_GENERIC and simplify load of
image/ramdisk
omap3_beagle: support findfdt and loadfdt for devicetree support
omap3_beagle: support booting from zImage and device tree as last
option
board/ti/beagle/beagle.c | 28 +++++++------------------
board/ti/beagle/beagle.h | 3 +--
include/configs/omap3_beagle.h | 44 ++++++++++++++++++++++++++++------------
3 files changed, 39 insertions(+), 36 deletions(-)
On Mon, Jul 15, 2013 at 07:11:27AM -0500, Nishanth Menon wrote: > With the latest transition to device tree, there is a need to simplify > the load of device tree depending on board type etc. While at it, simplify > few other changes as well. > > Testing: > with a uEnv.txt as: > bootdir=/ > bootpart=0:1 > > The following were the boot results: > Beagle (rev C1D): http://pastebin.com/fMdsKkgr > Beagle XM (rev C1): http://pastebin.com/p1zp9AhG > > Changes in V3 since v2: > - Minor fixes for RevB beagleboard DVIpup handling > http://marc.info/?t=137357970500004&r=1&w=2 > - Picked up acked-by from http://marc.info/?t=137357970700007&r=1&w=2 > > V2: http://marc.info/?l=u-boot&m=137358206228251&w=2 > V1: http://marc.info/?l=u-boot&m=137357963227510&w=2 > > Nishanth Menon (6): > omap3_beagle: remove JFFS2 support. > omap3_beagle: replace uImage.beagle with generic uImage > beagleboard: remove RevB support for BeagleBoard Xm > omap3_beagle: enable CMD_FS_GENERIC and simplify load of > image/ramdisk > omap3_beagle: support findfdt and loadfdt for devicetree support > omap3_beagle: support booting from zImage and device tree as last > option > > board/ti/beagle/beagle.c | 28 +++++++------------------ > board/ti/beagle/beagle.h | 3 +-- > include/configs/omap3_beagle.h | 44 ++++++++++++++++++++++++++++------------ > 3 files changed, 39 insertions(+), 36 deletions(-) Applied to u-boot-ti/master, thanks!
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index e152d3c..bdeee17 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -150,6 +150,7 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ +#define CONFIG_CMD_FS_GENERIC /* Generic FS support */ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define MTDIDS_DEFAULT "nand0=nand" @@ -211,6 +212,9 @@ "rdaddr=0x81000000\0" \ "usbtty=cdc_acm\0" \ "bootfile=uImage\0" \ + "ramdisk=ramdisk.gz\0" \ + "bootdir=/boot\0" \ + "bootpart=0:2\0" \ "console=ttyO2,115200n8\0" \ "mpurate=auto\0" \ "buddy=none\0" \ @@ -259,9 +263,8 @@ "omapdss.def_disp=${defaultdisplay} " \ "root=${ramroot} " \ "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ - "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \ + "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ + "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ @@ -293,7 +296,7 @@ "echo Running uenvcmd ...;" \ "run uenvcmd;" \ "fi;" \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot;" \ "fi;" \ "fi;" \
CMD_FS_GENERIC allows us to simplify where we load up our image from either from ext2/fat etc. So, lets use that instead of cumbersome options we currently use. Sticking with existing conventions, defaults will be: ramdisk=ramdisk.gz bootpart=0:2 (second partition) bootdir=/boot (/boot in second partition) This matches with the default behavior, these can be overriden by env files as needed. Signed-off-by: Nishanth Menon <nm@ti.com> --- include/configs/omap3_beagle.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)