From d079f8d587d8b3b8831a778cc3fe04ca22128e41 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Sat, 10 Dec 2016 12:44:35 +0100 Subject: [PATCH] beaglebone-uboot: update to 2016.11 --- .../patches/alarm-tweaks.patch | 160 ------------------ .../patches/include-sys-types.patch | 41 ----- srcpkgs/beaglebone-uboot/template | 8 +- 3 files changed, 4 insertions(+), 205 deletions(-) delete mode 100644 srcpkgs/beaglebone-uboot/patches/alarm-tweaks.patch delete mode 100644 srcpkgs/beaglebone-uboot/patches/include-sys-types.patch diff --git a/srcpkgs/beaglebone-uboot/patches/alarm-tweaks.patch b/srcpkgs/beaglebone-uboot/patches/alarm-tweaks.patch deleted file mode 100644 index 1ce364f5277..00000000000 --- a/srcpkgs/beaglebone-uboot/patches/alarm-tweaks.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- include/configs/am335x_evm.h 2014-07-14 11:16:45.000000000 -0600 -+++ include/configs/am335x_evm.h 2014-08-10 18:40:55.817027322 -0600 -@@ -17,6 +17,7 @@ - #define __CONFIG_AM335X_EVM_H - - #include -+#define CONFIG_SUPPORT_RAW_INITRD - - #ifndef CONFIG_SPL_BUILD - # define CONFIG_FIT -@@ -74,6 +75,8 @@ - - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - -+ -+ - #ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ -@@ -81,15 +84,17 @@ - "bootpart=0:2\0" \ - "bootdir=/boot\0" \ - "bootfile=zImage\0" \ -+ "fdtdir=/boot/dtbs\0" \ - "fdtfile=undefined\0" \ -+ "rdfile=initramfs-linux.img\0" \ - "console=ttyO0,115200n8\0" \ - "partitions=" \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ - "optargs=\0" \ - "mmcdev=0\0" \ -- "mmcroot=/dev/mmcblk0p2 ro\0" \ -- "mmcrootfstype=ext4 rootwait\0" \ -+ "mmcroot=/dev/mmcblk0p2\0" \ -+ "mmcrootextra=rw fixrtc rootwait\0" \ - "rootpath=/export/rootfs\0" \ - "nfsopts=nolock\0" \ - "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ -@@ -98,8 +103,7 @@ - "ramrootfstype=ext2\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ -- "root=${mmcroot} " \ -- "rootfstype=${mmcrootfstype}\0" \ -+ "root=${mmcroot} ${mmcrootextra}\0" \ - "spiroot=/dev/mtdblock4 rw\0" \ - "spirootfstype=jffs2\0" \ - "spisrcaddr=0xe0000\0" \ -@@ -122,37 +126,43 @@ - "${optargs} " \ - "root=${ramroot} " \ - "rootfstype=${ramrootfstype}\0" \ -- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ -+ "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ - "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ -- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ -- "mmcloados=run mmcargs; " \ -- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if run loadfdt; then " \ -- "bootz ${loadaddr} - ${fdtaddr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootz; " \ -- "else " \ -- "echo WARN: Cannot load the DT; " \ -- "fi; " \ -- "fi; " \ -- "else " \ -- "bootz; " \ -- "fi;\0" \ -+ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ - "mmcboot=mmc dev ${mmcdev}; " \ - "if mmc rescan; then " \ -+ "gpio set 54;" \ - "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootenv; then " \ -+ "gpio set 55;" \ - "echo Loaded environment from ${bootenv};" \ - "run importbootenv;" \ - "fi;" \ -+ "if test -n $cape; then " \ -+ "if test -e mmc ${bootpart} ${fdtdir}/$fdtbase-$cape.dtb; then " \ -+ "setenv fdtfile $fdtbase-$cape.dtb; " \ -+ "fi; " \ -+ "echo using: $fdtfile...; " \ -+ "fi; " \ -+ "echo Checking if uenvcmd is set ...;" \ - "if test -n $uenvcmd; then " \ -+ "gpio set 56; " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "if run loadimage; then " \ -- "run mmcloados;" \ -+ "if run loadfdt; then " \ -+ "run mmcargs;" \ -+ "if run loadramdisk; then " \ -+ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ -+ "else " \ -+ "bootz ${loadaddr} - ${fdtaddr};" \ -+ "fi;" \ -+ "else " \ -+ "echo Kernel found, but no device tree found;" \ -+ "fi;" \ - "fi;" \ -+ "echo No kernel found;"\ - "fi;\0" \ - "spiboot=echo Booting from spi ...; " \ - "run spiargs; " \ -@@ -169,28 +179,44 @@ - "ramboot=echo Booting from ramdisk ...; " \ - "run ramargs; " \ - "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ -- "findfdt="\ -+ "findfdt=" \ - "if test $board_name = A335BONE; then " \ -- "setenv fdtfile am335x-bone.dtb; fi; " \ -+ "setenv fdtfile am335x-bone.dtb; setenv fdtbase am335x-bone; fi; " \ - "if test $board_name = A335BNLT; then " \ -- "setenv fdtfile am335x-boneblack.dtb; fi; " \ -+ "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; fi; " \ - "if test $board_name = A33515BB; then " \ - "setenv fdtfile am335x-evm.dtb; fi; " \ - "if test $board_name = A335X_SK; then " \ - "setenv fdtfile am335x-evmsk.dtb; fi; " \ - "if test $fdtfile = undefined; then " \ - "echo WARNING: Could not determine device tree to use; fi; \0" \ -+ "findmmc=" \ -+ "if test $board_name = A335BNLT; then " \ -+ "setenv mmc1 1;" \ -+ "mmc dev 0;" \ -+ "if mmc rescan; then " \ -+ "setenv mmc0 1;" \ -+ "else " \ -+ "setenv mmc0 0;" \ -+ "fi;" \ -+ "fi;\0" \ - NANDARGS \ - DFUARGS - #endif - - #define CONFIG_BOOTCOMMAND \ -+ "gpio set 53; " \ -+ "i2c mw 0x24 1 0x3e; " \ -+ "run findmmc; " \ - "run findfdt; " \ - "run mmcboot;" \ -+ "gpio clear 56; " \ -+ "gpio clear 55; " \ -+ "gpio clear 54; " \ - "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ -- "run mmcboot;" \ -- "run nandboot;" -+ "if test $mmc0 = 1; then setenv mmcroot /dev/mmcblk1p2; fi; " \ -+ "run mmcboot;" - - /* NS16550 Configuration */ - #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ diff --git a/srcpkgs/beaglebone-uboot/patches/include-sys-types.patch b/srcpkgs/beaglebone-uboot/patches/include-sys-types.patch deleted file mode 100644 index 2f1ffe310eb..00000000000 --- a/srcpkgs/beaglebone-uboot/patches/include-sys-types.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- include/image.h -+++ include/image.h -@@ -24,6 +24,8 @@ - - #ifdef USE_HOSTCC - -+#include -+ - /* new uImage format support enabled on host */ - #define CONFIG_FIT 1 - #define CONFIG_OF_LIBFDT 1 ---- tools/imagetool.h -+++ tools/imagetool.h -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- tools/mkimage.h -+++ tools/mkimage.h -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- tools/proftool.c -+++ tools/proftool.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/srcpkgs/beaglebone-uboot/template b/srcpkgs/beaglebone-uboot/template index 4de7edea803..190ec7395b7 100644 --- a/srcpkgs/beaglebone-uboot/template +++ b/srcpkgs/beaglebone-uboot/template @@ -1,15 +1,15 @@ # Template file for 'beaglebone-uboot' pkgname=beaglebone-uboot -version=2014.07 -revision=2 +version=2016.11 +revision=1 wrksrc="u-boot-${version}" -hostmakedepends="bc" +hostmakedepends="bc dtc" short_desc="Beaglebone and BeagleBone Black U-Boot loader" maintainer="Juan RP " license="GPL-2" homepage="http://www.denx.de/wiki/U-Boot/WebHome" distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" -checksum=b4f83b8db325c21671a997198ec3a373e2e00dde2fcf17be9b9afd7cfd727f56 +checksum=45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 only_for_archs="armv7l armv7l-musl"