aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorGravatar Sergio Prado <sergio.prado@e-labworks.com>2015-10-03 12:40:02 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-10-06 09:51:28 +0100
commit0d71ab41720b1a1afd221db9b14a05bc277f7eac (patch)
treebe22476177a3dff8e76de7f6526329fb2fbeee00 /board
parent3fe434bf35b09ddf438392e6e5b4bc0b849495c7 (diff)
downloadbuildroot-0d71ab41720b1a1afd221db9b14a05bc277f7eac.tar.gz
buildroot-0d71ab41720b1a1afd221db9b14a05bc277f7eac.tar.bz2
wandboard_defconfig: bump u-boot to 2015.07 and kernel to 3.14.28_1.0.0
Bump U-boot version to 2015.07 from the mainline repository. Since there is SPL support for the wandboard in the U-boot 2015.07, it is now possible to boot the same U-boot image for all wandboard variants (solo/dual/quad). Bump kernel version to 3.14.28_1.0.0 from the wandboard git repository. Tested on Wandboard Solo, Wandboard Dual and Wandboard Quad. Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com> Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board')
-rw-r--r--board/wandboard/genimage.cfg10
-rw-r--r--board/wandboard/uboot-env.txt22
2 files changed, 23 insertions, 9 deletions
diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg
index 24c4049dd5..f5df1ff883 100644
--- a/board/wandboard/genimage.cfg
+++ b/board/wandboard/genimage.cfg
@@ -11,12 +11,18 @@ image sdcard.img {
hdimage {
}
- partition u-boot {
+ partition spl {
in-partition-table = "no"
- image = "u-boot.imx"
+ image = "SPL"
offset = 1024
}
+ partition u-boot {
+ in-partition-table = "no"
+ image = "u-boot.img"
+ offset = 70656
+ }
+
partition u-boot-env {
in-partition-table = "no"
image = "uboot-env.bin"
diff --git a/board/wandboard/uboot-env.txt b/board/wandboard/uboot-env.txt
index 7ca2b1a85c..f8c4fc1391 100644
--- a/board/wandboard/uboot-env.txt
+++ b/board/wandboard/uboot-env.txt
@@ -1,5 +1,6 @@
baudrate=115200
-bootcmd=mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loaduimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi
+boot_fdt=try
+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
bootdelay=3
bootscript=echo Running bootscript from mmc ...; source
console=ttymxc0
@@ -7,14 +8,21 @@ ethact=FEC
ethaddr=00:1f:7b:b2:05:ee
ethprime=FEC
loadaddr=0x12000000
+fdt_addr=0x18000000
+fdt_high=0xffffffff
+fdtfile=undefined
+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};
-loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}
-mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}
-mmcboot=echo Booting from mmc ...; run mmcargs; bootm;
+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;
mmcdev=0
mmcpart=1
-mmcroot=/dev/mmcblk0p1 rootwait rw
+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} ${uimage}; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if ${get_cmd} ${fdt_addr} ${fdt_file}; then bootm ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootm; else echo WARN: Cannot load the DT; fi; fi; else bootm; fi;
+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;
script=boot/boot.scr
-uimage=boot/uImage
+image=boot/zImage
+splashpos=m,m