mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
alarm/uboot-wandboard to 2014.01-1
This commit is contained in:
Kevin Mihelich
parent
f3e4777b5c
commit
f70e9178bc
|
|
@ -5,28 +5,29 @@ buildarch=4
|
|||
|
||||
pkgbase=uboot-wandboard
|
||||
pkgname=('uboot-wandboard-solo' 'uboot-wandboard-dual' 'uboot-wandboard-quad')
|
||||
pkgver=2013.07
|
||||
pkgrel=2
|
||||
pkgver=2014.01
|
||||
pkgrel=1
|
||||
arch=('armv7h')
|
||||
url="http://git.denx.de/u-boot.git/"
|
||||
license=('GPL')
|
||||
makedepends=('git')
|
||||
source=("uboot::git://git.denx.de/u-boot.git#tag=v${pkgver}"
|
||||
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
|
||||
"https://raw.github.com/eewiki/u-boot-patches/master/v${pkgver}/0001-wandboard-uEnv.txt-bootz-n-fixes.patch"
|
||||
'alarm.patch')
|
||||
md5sums=('SKIP'
|
||||
'8a9f8214097fac0825911698b90986d3')
|
||||
md5sums=('e531307578f6d32a7ccb1d04f1e08cbc'
|
||||
'07b1aba3db09dc86c2c3960baa4d77ad'
|
||||
'8f749cdb50b4deddbfa92655610ad5f4')
|
||||
|
||||
prepare() {
|
||||
cd uboot
|
||||
patch -p1 -i "${srcdir}"/alarm.patch
|
||||
rm -rf .git
|
||||
cd u-boot-${pkgver}
|
||||
patch -p1 -i ../0001-wandboard-uEnv.txt-bootz-n-fixes.patch
|
||||
patch -p1 -i ../alarm.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd uboot
|
||||
cd u-boot-${pkgver}
|
||||
|
||||
unset CFLAGS
|
||||
unset CXXFLAGS
|
||||
unset CFLAGS CXXFLAGS LDFLAGS
|
||||
|
||||
for i in solo dl quad; do
|
||||
make distclean
|
||||
|
|
@ -42,7 +43,7 @@ package_uboot-wandboard-solo() {
|
|||
install=${pkgbase}.install
|
||||
|
||||
mkdir -p "${pkgdir}"/boot
|
||||
cp uboot/u-boot-solo.imx "${pkgdir}"/boot/u-boot.imx
|
||||
cp u-boot-${pkgver}/u-boot-solo.imx "${pkgdir}"/boot/u-boot.imx
|
||||
}
|
||||
|
||||
package_uboot-wandboard-dual() {
|
||||
|
|
@ -51,7 +52,7 @@ package_uboot-wandboard-dual() {
|
|||
install=${pkgbase}.install
|
||||
|
||||
mkdir -p "${pkgdir}"/boot
|
||||
cp uboot/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
|
||||
cp u-boot-${pkgver}/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
|
||||
}
|
||||
|
||||
package_uboot-wandboard-quad() {
|
||||
|
|
@ -60,5 +61,5 @@ package_uboot-wandboard-quad() {
|
|||
install=${pkgbase}.install
|
||||
|
||||
mkdir -p "${pkgdir}"/boot
|
||||
cp uboot/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
|
||||
cp u-boot-${pkgver}/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,165 +1,82 @@
|
|||
diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
|
||||
--- a/include/configs/wandboard.h 2013-07-25 18:18:02.185623052 -0600
|
||||
+++ b/include/configs/wandboard.h 2013-08-13 11:18:20.974683636 -0600
|
||||
@@ -51,7 +51,7 @@
|
||||
#define CONFIG_CMD_BMODE
|
||||
#define CONFIG_CMD_SETEXPR
|
||||
|
||||
-#define CONFIG_BOOTDELAY 5
|
||||
+#define CONFIG_BOOTDELAY 1
|
||||
|
||||
#define CONFIG_SYS_MEMTEST_START 0x10000000
|
||||
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
|
||||
@@ -70,6 +70,8 @@
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
#define CONFIG_CMD_EXT2
|
||||
#define CONFIG_CMD_FAT
|
||||
+#define CONFIG_CMD_EXT4
|
||||
+#define CONFIG_CMD_FS_GENERIC
|
||||
#define CONFIG_DOS_PARTITION
|
||||
|
||||
/* Ethernet Configuration */
|
||||
@@ -102,26 +104,32 @@
|
||||
#define CONFIG_IPUV3_CLK 260000000
|
||||
|
||||
#if defined(CONFIG_MX6DL)
|
||||
-#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
|
||||
+#define CONFIG_DEFAULT_FDT_FILE "/boot/dtbs/imx6dl-wandboard.dtb"
|
||||
#elif defined(CONFIG_MX6Q)
|
||||
-#define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
|
||||
+#define CONFIG_DEFAULT_FDT_FILE "/boot/dtbs/imx6q-wandboard.dtb"
|
||||
#elif defined(CONFIG_MX6S)
|
||||
-#define CONFIG_DEFAULT_FDT_FILE "imx6s-wandboard.dtb"
|
||||
+#define CONFIG_DEFAULT_FDT_FILE "/boot/dtbs/imx6s-wandboard.dtb"
|
||||
--- a/include/configs/wandboard.h 2014-03-19 15:09:36.119921706 -0600
|
||||
+++ b/include/configs/wandboard.h 2014-03-19 15:25:36.641399875 -0600
|
||||
@@ -108,6 +108,8 @@
|
||||
#define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
|
||||
#endif
|
||||
|
||||
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
|
||||
+
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
- "script=boot.scr\0" \
|
||||
- "uimage=uImage\0" \
|
||||
+ "script=/boot/boot.scr\0" \
|
||||
+ "uimage=/boot/uImage\0" \
|
||||
+ "zimage=/boot/zImage\0" \
|
||||
"console=ttymxc0\0" \
|
||||
"fdt_high=0xffffffff\0" \
|
||||
"initrd_high=0xffffffff\0" \
|
||||
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
||||
"fdt_addr=0x11000000\0" \
|
||||
- "boot_fdt=try\0" \
|
||||
+ "boot_fdt=no\0" \
|
||||
"ip_dyn=yes\0" \
|
||||
- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
||||
+ "optargs=\0" \
|
||||
+ "video=\0" \
|
||||
+ "mmcdev=0\0" \
|
||||
"script=boot.scr\0" \
|
||||
"image=zImage\0" \
|
||||
@@ -123,8 +125,7 @@
|
||||
"video=\0" \
|
||||
"mmcdev=0\0" \
|
||||
"mmcpart=1\0" \
|
||||
- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
|
||||
+ "mmcroot=/dev/mmcblk0p1 rw\0" \
|
||||
+ "mmcrootfstype=ext4 rootwait\0" \
|
||||
- "mmcroot=/dev/mmcblk0p2 ro\0" \
|
||||
- "mmcrootfstype=ext4 rootwait\0" \
|
||||
+ "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
|
||||
"update_sd_firmware_filename=u-boot.imx\0" \
|
||||
"update_sd_firmware=" \
|
||||
"if test ${ip_dyn} = yes; then " \
|
||||
@@ -137,27 +145,34 @@
|
||||
"fi; " \
|
||||
"fi\0" \
|
||||
@@ -142,35 +143,23 @@
|
||||
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
||||
- "root=${mmcroot}\0" \
|
||||
+ "${optargs} " \
|
||||
+ "root=${mmcroot} " \
|
||||
+ "rootfstype=${mmcrootfstype} " \
|
||||
+ "video=${video}\0" \
|
||||
"${optargs} " \
|
||||
"root=${mmcroot} " \
|
||||
- "rootfstype=${mmcrootfstype} " \
|
||||
"video=${video}\0" \
|
||||
- "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
|
||||
+ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/uEnv.txt\0" \
|
||||
+ "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
|
||||
+ "env import -t $loadaddr $filesize\0" \
|
||||
"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
|
||||
"env import -t $loadaddr $filesize\0" \
|
||||
"loadbootscript=" \
|
||||
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
||||
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
||||
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
||||
"bootscript=echo Running bootscript from mmc ...; " \
|
||||
"source\0" \
|
||||
- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
||||
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
||||
+ "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
||||
+ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${zImage}\0" \
|
||||
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
||||
"mmcboot=echo Booting from mmc ...; " \
|
||||
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
||||
- "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
|
||||
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
|
||||
- "mmcboot=echo Booting from mmc ...; " \
|
||||
+ "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/uImage\0" \
|
||||
+ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/zImage\0" \
|
||||
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/dtbs/${fdt_file}\0" \
|
||||
+ "mmcbootz=echo Booting from mmc ...; " \
|
||||
"run mmcargs; " \
|
||||
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
||||
"if run loadfdt; then " \
|
||||
- "bootm ${loadaddr} - ${fdt_addr}; " \
|
||||
+ "bootz ${loadaddr} - ${fdt_addr}; " \
|
||||
"else " \
|
||||
"if test ${boot_fdt} = try; then " \
|
||||
- "bootm; " \
|
||||
+ "bootz ${loadaddr}; " \
|
||||
"else " \
|
||||
"echo WARN: Cannot load the DT; " \
|
||||
"fi; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
- "bootm; " \
|
||||
+ "bootm ${loadaddr}; " \
|
||||
"fi;\0" \
|
||||
"bootz ${loadaddr} - ${fdt_addr};\0" \
|
||||
- "mmcbootdefault=echo Booting from mmc ...; " \
|
||||
- "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 ${loadaddr}; " \
|
||||
- "else " \
|
||||
- "echo WARN: Cannot load the DT; " \
|
||||
- "fi; " \
|
||||
- "fi; " \
|
||||
- "else " \
|
||||
- "bootz ${loadaddr}; " \
|
||||
- "fi;\0" \
|
||||
+ "mmcbootm=echo Booting from mmc ...; " \
|
||||
+ "run mmcargs; " \
|
||||
+ "bootm ${loadaddr};\0" \
|
||||
"netargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=/dev/nfs " \
|
||||
@@ -169,32 +184,38 @@
|
||||
"else " \
|
||||
"setenv get_cmd tftp; " \
|
||||
"fi; " \
|
||||
- "${get_cmd} ${uimage}; " \
|
||||
+ "${get_cmd} zImage; " \
|
||||
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
||||
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
|
||||
- "bootm ${loadaddr} - ${fdt_addr}; " \
|
||||
+ "bootz ${loadaddr} - ${fdt_addr}; " \
|
||||
"else " \
|
||||
"if test ${boot_fdt} = try; then " \
|
||||
- "bootm; " \
|
||||
+ "bootz ${loadaddr}; " \
|
||||
"else " \
|
||||
"echo WARN: Cannot load the DT; " \
|
||||
"fi; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
- "bootm; " \
|
||||
+ "bootz ${loadaddr}; " \
|
||||
"fi;\0"
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
- "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"
|
||||
+ "mmc dev ${mmcdev};" \
|
||||
+ "if mmc rescan; then " \
|
||||
+ "echo SD/MMC found on device ${mmcdev};" \
|
||||
+ "if run loadbootenv; then " \
|
||||
+ "run importbootenv;" \
|
||||
+ "fi;" \
|
||||
+ "echo Checking if uenvcmd is set ...;" \
|
||||
+ "if test -n $uenvcmd; then " \
|
||||
+ "echo Running uenvcmd ...;" \
|
||||
+ "run uenvcmd;" \
|
||||
+ "fi;" \
|
||||
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
||||
@@ -208,10 +197,14 @@
|
||||
"echo Running uenvcmd ...;" \
|
||||
"run uenvcmd;" \
|
||||
"fi;" \
|
||||
+ "echo Running default loaduimage ...;" \
|
||||
+ "if run loaduimage; then " \
|
||||
+ "run mmcboot;" \
|
||||
+ "run mmcbootm;" \
|
||||
+ "fi;" \
|
||||
+ "fi;"
|
||||
"echo Running default loadzimage ...;" \
|
||||
"if run loadzimage; then " \
|
||||
"run loadfdt;" \
|
||||
- "run mmcboot;" \
|
||||
+ "run mmcbootz;" \
|
||||
"fi;" \
|
||||
"fi;"
|
||||
|
||||
/* Miscellaneous configurable options */
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
@@ -237,6 +258,7 @@
|
||||
|
||||
#define CONFIG_OF_LIBFDT
|
||||
#define CONFIG_CMD_BOOTZ
|
||||
+#define CONFIG_SUPPORT_RAW_INITRD
|
||||
|
||||
#ifndef CONFIG_SYS_DCACHE_OFF
|
||||
#define CONFIG_CMD_CACHE
|
||||
|
|
|
|||
Loading…
Reference in a new issue