diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/u-boot/Makefile | 24 | ||||
| -rw-r--r-- | package/u-boot/files/boot.script.bpi | 4 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-include_configs_rpi_h | 44 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-tools_Makefile | 11 |
4 files changed, 21 insertions, 62 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 781f3cd9d..2b8404d39 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2015.01 -PKG_RELEASE:= 3 -PKG_HASH:= 383051a656ebe11757b17d38a3326387e4a1b0949ca8a9e8ee506bf71dac9fde +PKG_VERSION:= 2015.07 +PKG_RELEASE:= 1 +PKG_HASH:= 0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= openssl-host +HOST_BUILDDEP:= openssl-host device-tree-compiler-host PKG_BUILDDEP:= u-boot-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 atmel-ngw100 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -24,6 +24,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +UBOOT:= u-boot.bin ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig endif @@ -33,6 +34,10 @@ endif ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y) CONFIG:= atngw100_defconfig endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) +CONFIG:= Bananapro_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin +endif HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" @@ -55,13 +60,15 @@ do-configure: (cd $(WRKBUILD) && $(MAKE) $(CONFIG)) do-build: - (cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \ + (cd $(WRKBUILD) && env \ + PATH='$(HOST_PATH)' \ + CROSS_COMPILE='$(TARGET_CROSS)' \ GCC_HONOUR_COPTS=s $(MAKE)) (cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \ GCC_HONOUR_COPTS=s $(MAKE) env) u-boot-install: - $(CP) $(WRKBUILD)/u-boot.bin $(FW_DIR) + $(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR) $(INSTALL_DIR) $(IDIR_U_BOOT)/etc $(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc $(INSTALL_DIR) $(IDIR_U_BOOT)/usr/bin @@ -70,6 +77,9 @@ u-boot-install: (cd $(IDIR_U_BOOT)/usr/bin && ln -sf fw_printenv fw_setenv) $(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin $(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) + $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) +endif include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/u-boot/files/boot.script.bpi b/package/u-boot/files/boot.script.bpi new file mode 100644 index 000000000..0e7d9cd95 --- /dev/null +++ b/package/u-boot/files/boot.script.bpi @@ -0,0 +1,4 @@ +setenv bootargs console=ttyS0 root=/dev/mmcblk0p1 +ext4load mmc 0:1 0x42000000 boot/${fdtfile} +ext4load mmc 0:1 0x48000000 boot/kernel +bootz 0x48000000 - 0x42000000 diff --git a/package/u-boot/patches/patch-include_configs_rpi_h b/package/u-boot/patches/patch-include_configs_rpi_h deleted file mode 100644 index 13774f2d2..000000000 --- a/package/u-boot/patches/patch-include_configs_rpi_h +++ /dev/null @@ -1,44 +0,0 @@ ---- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/include/configs/rpi.h 2015-01-06 09:00:23.000000000 +0100 -+++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/include/configs/rpi.h 2015-01-07 18:05:13.563156954 +0100 -@@ -19,6 +19,8 @@ - - #include <linux/sizes.h> - -+#undef DEBUG -+ - /* Architecture, CPU, etc.*/ - #define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_BCM2835 -@@ -96,7 +98,7 @@ - /* Console UART */ - #define CONFIG_PL01X_SERIAL - #define CONFIG_CONS_INDEX 0 --#define CONFIG_BAUDRATE 115200 -+#define CONFIG_BAUDRATE 9600 - - /* Console configuration */ - #define CONFIG_SYS_CBSIZE 1024 -@@ -117,7 +119,7 @@ - - /* Shell */ - #define CONFIG_SYS_MAXARGS 8 --#define CONFIG_SYS_PROMPT "U-Boot> " -+#define CONFIG_SYS_PROMPT "CONET-Boot> " - #define CONFIG_COMMAND_HISTORY - - /* Commands */ -@@ -185,9 +187,12 @@ - - #define CONFIG_EXTRA_ENV_SETTINGS \ - ENV_DEVICE_SETTINGS \ -- ENV_MEM_LAYOUT_SETTINGS \ -- BOOTENV -+ ENV_MEM_LAYOUT_SETTINGS - - #define CONFIG_BOOTDELAY 2 -+#define CONFIG_CMD_BOOTMENU -+#define CONFIG_MENU -+#define CONFIG_AUTOBOOT_KEYED -+#define CONFIG_MENU_SHOW - - #endif diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile deleted file mode 100644 index 90ef0c55d..000000000 --- a/package/u-boot/patches/patch-tools_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2015.01.orig/tools/Makefile 2015-01-12 15:39:08.000000000 +0100 -+++ u-boot-2015.01/tools/Makefile 2015-02-04 14:51:33.663150060 +0100 -@@ -115,7 +115,7 @@ endif - - # MXSImage needs LibSSL - ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) --HOSTLOADLIBES_mkimage += -lssl -lcrypto -+HOSTLOADLIBES_mkimage += -lssl -lcrypto -ldl - endif - - HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage) |