aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-01-23 13:41:49 +0100
committerFelix Fietkau <nbd@nbd.name>2017-01-24 16:21:25 +0100
commite018c4d7ab8b712ce8b538e8cf3275ca90e8c02e (patch)
treeb1bade478cc8187841c3e4e543752eb73a3eaea0 /package/boot
parent9913c4eae47b941cf35f5245f5b0d1fbf1c97eec (diff)
downloadupstream-e018c4d7ab8b712ce8b538e8cf3275ca90e8c02e.tar.gz
upstream-e018c4d7ab8b712ce8b538e8cf3275ca90e8c02e.tar.bz2
upstream-e018c4d7ab8b712ce8b538e8cf3275ca90e8c02e.zip
uboot-sunxi: clean up, switch to u-boot.mk
Instead of referencing u-boot packages from device profiles and having a -all metapackage, make the u-boot packages hidden (they don't install to bin/ anyway), and name the files in KERNEL_BUILD_DIR appropriately Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/boot')
-rw-r--r--package/boot/uboot-sunxi/Makefile170
-rw-r--r--package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch11
2 files changed, 107 insertions, 74 deletions
diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index bc80dcfade..311437a0af 100644
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -9,90 +9,134 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
-PKG_NAME:=u-boot
PKG_VERSION:=2016.03
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
+
PKG_HASH:=e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb
+
PKG_MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
-PKG_BUILD_PARALLEL:=1
+include $(INCLUDE_DIR)/u-boot.mk
+include $(INCLUDE_DIR)/package.mk
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+define U-Boot/Default
+ BUILD_TARGET:=sunxi
+ UBOOT_IMAGE:=u-boot-sunxi-with-spl.bin
+ UENV:=default
+ HIDDEN:=1
+endef
-include $(INCLUDE_DIR)/package.mk
+define U-Boot/A10-OLinuXino-Lime
+ NAME:=A10 OLinuXino LIME
+ BUILD_DEVICES:=sun4i-a10-olinuxino-lime
+endef
+
+define U-Boot/A13-OLinuXino
+ NAME:=A13 OlinuXino
+ BUILD_DEVICES:=sun5i-a13-olinuxino
+endef
-define Package/uboot/template
-define Package/uboot-sunxi-$(1)
- SECTION:=boot
- CATEGORY:=Boot Loaders
- DEPENDS:=@TARGET_sunxi
- TITLE:=U-Boot for $(2)
- URL:=http://www.denx.de/wiki/U-Boot
- VARIANT:=$(1)
+define U-Boot/A20-OLinuXino-Lime
+ NAME:=A20 OLinuXino LIME
+ BUILD_DEVICES:=sun7i-a20-olinuxino-lime
endef
-define Package/uboot-sunxi-$(1)/install
- $(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
- $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-u-boot-with-spl.bin
- mkimage -C none -A arm -T script -d uEnv-$(if $(3),$(3),default).txt \
- $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-boot.scr
+define U-Boot/A20-OLinuXino_MICRO
+ NAME:=A20 OLinuXino MICRO
+ BUILD_DEVICES:=sun7i-a20-olinuxino-micro
endef
-UBOOT_SUNXI_PACKAGES += uboot-sunxi-$(1)
+define U-Boot/Bananapi
+ NAME:=Bananapi
+ BUILD_DEVICES:=sun7i-a20-bananapi
+endef
+define U-Boot/Bananapro
+ NAME:=Bananapro
+ BUILD_DEVICES:=sun7i-a20-bananapro
endef
-$(eval $(call Package/uboot/template,A10-OLinuXino-Lime,the A10 OLinuXino LIME))
-$(eval $(call Package/uboot/template,A13-OLinuXino,the A13 OlinuXino))
-$(eval $(call Package/uboot/template,A20-OLinuXino-Lime,the A20 OLinuXino LIME))
-$(eval $(call Package/uboot/template,A20-OLinuXino_MICRO,A20 OLinuXino MICRO))
-$(eval $(call Package/uboot/template,Bananapi,Bananapi))
-$(eval $(call Package/uboot/template,Bananapro,Bananapro))
-$(eval $(call Package/uboot/template,Cubieboard,Cubieboard))
-$(eval $(call Package/uboot/template,Cubieboard2,Cubieboard2))
-$(eval $(call Package/uboot/template,Cubietruck,Cubietruck))
-$(eval $(call Package/uboot/template,Hummingbird_A31,the Hummingbird A31 board))
-$(eval $(call Package/uboot/template,Mele_M9,the Mele M9 (A31)))
-$(eval $(call Package/uboot/template,OLIMEX_A13_SOM,the Olimex A13 SOM))
-$(eval $(call Package/uboot/template,Linksprite_pcDuino,Linksprite pcDuino))
-$(eval $(call Package/uboot/template,Linksprite_pcDuino3,Linksprite pcDuino3))
-$(eval $(call Package/uboot/template,Lamobo_R1,Lamobo R1))
-$(eval $(call Package/uboot/template,orangepi_plus,Orange Pi Plus (H3)))
-$(eval $(call Package/uboot/template,pangolin,Theobroma A31-yQ7 devboard,pangolin))
+define U-Boot/Cubieboard
+ NAME:=Cubieboard
+ BUILD_DEVICES:=sun4i-a10-cubieboard
+endef
-define Package/uboot-sunxi-all
- SECTION:=boot
- CATEGORY:=Boot Loaders
- DEPENDS:=@TARGET_sunxi
- TITLE:=Meta package for selecting all variants of uboot-sunxi
- URL:=http://www.denx.de/wiki/U-Boot
- DEPENDS:=$(patsubst %,+%,$(UBOOT_SUNXI_PACKAGES))
+define U-Boot/Cubieboard2
+ NAME:=Cubieboard2
+ BUILD_DEVICES:=sun7i-a20-cubieboard2
endef
-ifdef BUILD_VARIANT
-define Build/Configure
- +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
- USE_PRIVATE_LIBGCC=yes $(BUILD_VARIANT)_defconfig
+define U-Boot/Cubietruck
+ NAME:=Cubietruck
+ BUILD_DEVICES:=sun7i-a20-cubietruck
endef
-define Build/Compile
- +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
- CROSS_COMPILE=$(TARGET_CROSS) \
- DTCDIR=$(LINUX_DIR)/scripts/dtc/
+define U-Boot/Hummingbird_A31
+ NAME:=Hummingbird A31 board
endef
-else # BUILD_VARIANT
-define Build/Prepare
+
+define U-Boot/Mele_M9
+ NAME:=Mele M9 (A31)
+ BUILD_DEVICES:=sun6i-a31-m9
endef
-define Build/Configure
+
+define U-Boot/OLIMEX_A13_SOM
+ NAME:=Olimex A13 SOM
+ BUILD_DEVICES:=sun5i-a13-olimex-som
+endef
+
+define U-Boot/Linksprite_pcDuino
+ NAME:=Linksprite pcDuino
+ BUILD_DEVICES:=sun4i-a10-pcduino
endef
-define Build/Compile
+
+define U-Boot/Linksprite_pcDuino3
+ NAME:=Linksprite pcDuino3
+ BUILD_DEVICES:=sun7i-a20-pcduino3
+endef
+
+define U-Boot/Lamobo_R1
+ NAME:=Lamobo R1
+ BUILD_DEVICES:=sun7i-a20-lamobo-r1
+endef
+
+define U-Boot/orangepi_plus
+ NAME:=Orange Pi Plus (H3)
+ BUILD_DEVICES:=sun8i-h3-orangepi-plus
+endef
+
+define U-Boot/pangolin
+ NAME:=Theobroma A31-yQ7 devboard
+ UENV:=pangolin
+endef
+
+UBOOT_TARGETS := \
+ A10-OLinuXino-Lime \
+ A13-OLinuXino \
+ A20-OLinuXino-Lime \
+ A20-OLinuXino_MICRO \
+ Bananapi \
+ Bananapro \
+ Cubieboard \
+ Cubieboard2 \
+ Cubietruck \
+ Hummingbird_A31 \
+ Mele_M9 \
+ OLIMEX_A13_SOM \
+ Linksprite_pcDuino \
+ Linksprite_pcDuino3 \
+ Lamobo_R1 \
+ orangepi_plus \
+ pangolin
+
+UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
+
+define Build/InstallDev
+ $(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(KERNEL_BUILD_DIR)/$(BUILD_DEVICES)-u-boot-with-spl.bin
+ mkimage -C none -A arm -T script -d uEnv-$(UENV).txt \
+ $(KERNEL_BUILD_DIR)/$(BUILD_DEVICES)-boot.scr
+endef
+
+define Package/u-boot/install/default
endef
-endif # BUILD_VARIANT
-$(foreach pkg,$(UBOOT_SUNXI_PACKAGES), \
- $(eval $(call BuildPackage,$(pkg))) \
-)
-$(eval $(call BuildPackage,uboot-sunxi-all))
+$(eval $(call BuildPackage/U-Boot))
diff --git a/package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch b/package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch
deleted file mode 100644
index 6471e78656..0000000000
--- a/package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -348,7 +348,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump
- AWK = awk
- PERL = perl
- PYTHON = python
--DTC = dtc
-+DTC = $(DTCDIR)dtc
- CHECK = sparse
-
- CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \