path: root/board
diff options
authorGravatar Fabio Estevam <fabio.estevam@nxp.com>2016-09-11 16:42:05 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-09-11 21:58:18 +0200
commit9b15e3a2b755b1847b93b57d61858c99b7fbabae (patch)
tree291f32e2c403603d3a4594a63021744981f2da5a /board
parent7849020e03a5a3b429baa9257bc7e61e08f67250 (diff)
wandboard: Use U-Boot 2016.07
Upgrade U-Boot version to 2016.07 and make proper use of U-Boot distro configuration features. Provide a boot.scr binary script that is one of the standard ways to pass a U-Boot script with distro features enabled. With this method the uboot-env.txt file is no longer needed, so it is removed. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board')
4 files changed, 15 insertions, 35 deletions
diff --git a/board/wandboard/boot.scr.txt b/board/wandboard/boot.scr.txt
new file mode 100644
index 0000000000..7a8aa4bd54
--- /dev/null
+++ b/board/wandboard/boot.scr.txt
@@ -0,0 +1,7 @@
+setenv finduuid "part uuid mmc 0:1 uuid"
+run finduuid
+run findfdt
+setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4"
+load mmc 0:1 ${fdt_addr} boot/${fdtfile}
+load mmc 0:1 ${loadaddr} boot/zImage
+bootz ${loadaddr} - ${fdt_addr}
diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg
index f5df1ff883..32c7c16c8d 100644
--- a/board/wandboard/genimage.cfg
+++ b/board/wandboard/genimage.cfg
@@ -23,13 +23,6 @@ image sdcard.img {
offset = 70656
- partition u-boot-env {
- in-partition-table = "no"
- image = "uboot-env.bin"
- offset = 393216
- size = 8192
- }
partition rootfs {
partition-type = 0x83
image = "rootfs.ext2"
diff --git a/board/wandboard/post-build.sh b/board/wandboard/post-build.sh
new file mode 100755
index 0000000000..07c480e616
--- /dev/null
+++ b/board/wandboard/post-build.sh
@@ -0,0 +1,8 @@
+BOARD_DIR="$(dirname $0)"
+$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none \
+-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
+install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr
diff --git a/board/wandboard/uboot-env.txt b/board/wandboard/uboot-env.txt
deleted file mode 100644
index f8c4fc1391..0000000000
--- a/board/wandboard/uboot-env.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-bootcmd=run findfdt; mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi
-bootscript=echo Running bootscript from mmc ...; source
-findfdt=if test $board_rev = MX6Q ; then setenv fdtfile imx6q-wandboard.dtb; fi; if test $board_rev = MX6DL ; then setenv fdtfile imx6dl-wandboard.dtb; fi; if test $fdtfile = undefined; then echo WARNING: Could not determine dtb to use; fi;
-loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/${fdtfile}
-loadbootscript=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};
-loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}
-mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}; run videoargs
-videoargs=setenv nextcon 0; if hdmidet; then setenv bootargs ${bootargs} video=mxcfb${nextcon}:dev=hdmi,1280x720M@60,if=RGB24; setenv fbmen fbmem=28M; setexpr nextcon ${nextcon} + 1; else echo - no HDMI monitor;fi; i2c dev 1; if i2c probe 0x10; then setenv bootargs ${bootargs} video=mxcfb${nextcon}:dev=lcd,800x480@60,if=RGB666,bpp=32; if test 0 -eq ${nextcon}; then setenv fbmem fbmem=10M; else setenv fbmem ${fbmem},10M; fi; setexpr nextcon ${nextcon} + 1; else echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';fi; setenv bootargs ${bootargs} ${fbmem}
-mmcboot=echo Booting from mmc ...; run mmcargs; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if run loadfdt; then bootz ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootz; else echo WARN: Cannot load the DT; fi; fi; else bootz; fi;
-mmcroot=/dev/mmcblk2p1 rootwait rw
-netargs=setenv bootargs console=${console},${baudrate} root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp
-netboot=echo Booting from net ...; run netargs; if test ${ip_dyn} = yes; then setenv get_cmd dhcp; else setenv get_cmd tftp; fi; ${get_cmd} ${image}; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if ${get_cmd} ${fdt_addr} /boot/${fdtfile}; then bootz ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootz; else echo WARN: Cannot load the DT; fi; fi; else bootz; fi;