summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/u-boot-git/Makefile4
-rw-r--r--package/u-boot-git/files/boot.script.bpi5
-rwxr-xr-xscripts/install.sh10
-rw-r--r--target/arm/Makefile4
-rw-r--r--target/arm/kernel/banana-pro4
5 files changed, 24 insertions, 3 deletions
diff --git a/package/u-boot-git/Makefile b/package/u-boot-git/Makefile
index c2fb1d8f1..32ea30991 100644
--- a/package/u-boot-git/Makefile
+++ b/package/u-boot-git/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= u-boot-git
PKG_VERSION:= 3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
HOST_BUILDDEP:= openssl-host device-tree-compiler-host
@@ -67,6 +67,7 @@ do-build:
u-boot-git-install:
$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/etc
+ #$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/boot
$(CP) ./files/fw_env.config $(IDIR_U_BOOT_GIT)/etc
$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/usr/bin
#$(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \
@@ -74,6 +75,7 @@ u-boot-git-install:
#(cd $(IDIR_U_BOOT_GIT)/usr/bin && ln -sf fw_printenv fw_setenv)
#$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT_GIT)/usr/bin
#$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT_GIT)/usr/bin
+ $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR)
include $(ADK_TOPDIR)/mk/host-bottom.mk
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/u-boot-git/files/boot.script.bpi b/package/u-boot-git/files/boot.script.bpi
new file mode 100644
index 000000000..e18e1b334
--- /dev/null
+++ b/package/u-boot-git/files/boot.script.bpi
@@ -0,0 +1,5 @@
+setenv bootargs 'console=ttyS0 root=/dev/mmcblk0p1'
+ext4load mmc 0 0x43000000 boot/kernel
+ext4load mmc 0 0x48000000 boot/sun7i-a20-bananapro.dtb
+printenv
+bootz 0x43000000 - 0x48000000 \ No newline at end of file
diff --git a/scripts/install.sh b/scripts/install.sh
index 81001381f..74cbaabc9 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -558,6 +558,16 @@ case $target {
break
done
;;
+(banana-pro)
+ for x in "$fwdir"/*.dtb; do
+ [[ -e "$x" ]] && cp "$fwdir"/*.dtb "$R/boot/"
+ break
+ done
+ #Scrip für uboot erstellen
+ mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+ -n "BananaPro" \
+ -d $fwdir/boot.script.bpi $R/boot/boot.scr.uimg
+ ;;
}
cd "$R"
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 80c72c93f..4053160b2 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -145,6 +145,10 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
dtbs $(MAKE_TRACE)
endif
+ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
+ env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
+ dtbs sun7i-a20-bananapro.dtb
+endif
ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE)
diff --git a/target/arm/kernel/banana-pro b/target/arm/kernel/banana-pro
index c06104359..1388ae678 100644
--- a/target/arm/kernel/banana-pro
+++ b/target/arm/kernel/banana-pro
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_SUN7I=y
+CONFIG_ARCH_SUNXI=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_SUNXI=y
+CONFIG_SERIAL_8250_SUNXI=y \ No newline at end of file