aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-01-23 12:40:32 +0100
committerFelix Fietkau <nbd@nbd.name>2017-01-24 16:21:25 +0100
commitbb88ec947fc7f4db6ada9ccccb0c4d09c75742b0 (patch)
tree192ce26a517d60b19740bc30a2c2aaa821589cc7 /package/boot
parent12bfa1c425e5012e063b0afd9a09d2dfefc20eee (diff)
downloadupstream-bb88ec947fc7f4db6ada9ccccb0c4d09c75742b0.tar.gz
upstream-bb88ec947fc7f4db6ada9ccccb0c4d09c75742b0.tar.bz2
upstream-bb88ec947fc7f4db6ada9ccccb0c4d09c75742b0.zip
uboot-oxnas: switch to u-boot.mk
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/boot')
-rw-r--r--package/boot/uboot-oxnas/Makefile86
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/Makefile (renamed from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/Makefile)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/clock.c (renamed from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/clock.c)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/pinmux.c (renamed from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/pinmux.c)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/reset.c (renamed from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/reset.c)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/timer.c (renamed from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/timer.c)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/clock.h (renamed from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/clock.h)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/cpu.h (renamed from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/cpu.h)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/hardware.h (renamed from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/hardware.h)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/pinmux.h (renamed from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/pinmux.h)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/spl.h (renamed from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/spl.h)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/sysctl.h (renamed from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/sysctl.h)0
-rw-r--r--package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/timer.h (renamed from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/timer.h)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/Kconfig (renamed from package/boot/uboot-oxnas/files/board/ox820/Kconfig)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/MAINTAINERS (renamed from package/boot/uboot-oxnas/files/board/ox820/MAINTAINERS)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/Makefile (renamed from package/boot/uboot-oxnas/files/board/ox820/Makefile)0
-rwxr-xr-xpackage/boot/uboot-oxnas/src/board/ox820/ddr.c (renamed from package/boot/uboot-oxnas/files/board/ox820/ddr.c)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/ddr.h (renamed from package/boot/uboot-oxnas/files/board/ox820/ddr.h)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/lowlevel_init.S (renamed from package/boot/uboot-oxnas/files/board/ox820/lowlevel_init.S)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/ox820.c (renamed from package/boot/uboot-oxnas/files/board/ox820/ox820.c)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/spl_start.S (renamed from package/boot/uboot-oxnas/files/board/ox820/spl_start.S)0
-rw-r--r--package/boot/uboot-oxnas/src/board/ox820/u-boot-spl.lds (renamed from package/boot/uboot-oxnas/files/board/ox820/u-boot-spl.lds)0
-rw-r--r--package/boot/uboot-oxnas/src/common/env_ext4.c (renamed from package/boot/uboot-oxnas/files/common/env_ext4.c)0
-rw-r--r--package/boot/uboot-oxnas/src/common/spl/spl_block.c (renamed from package/boot/uboot-oxnas/files/common/spl/spl_block.c)0
-rw-r--r--package/boot/uboot-oxnas/src/configs/ox820_defconfig (renamed from package/boot/uboot-oxnas/files/configs/ox820_defconfig)0
-rw-r--r--package/boot/uboot-oxnas/src/drivers/block/plxsata_ide.c (renamed from package/boot/uboot-oxnas/files/drivers/block/plxsata_ide.c)0
-rw-r--r--package/boot/uboot-oxnas/src/drivers/usb/host/ehci-oxnas.c (renamed from package/boot/uboot-oxnas/files/drivers/usb/host/ehci-oxnas.c)0
-rw-r--r--package/boot/uboot-oxnas/src/include/configs/ox820.h (renamed from package/boot/uboot-oxnas/files/include/configs/ox820.h)0
-rw-r--r--package/boot/uboot-oxnas/src/tools/mkox820crc.c (renamed from package/boot/uboot-oxnas/files/tools/mkox820crc.c)0
29 files changed, 10 insertions, 76 deletions
diff --git a/package/boot/uboot-oxnas/Makefile b/package/boot/uboot-oxnas/Makefile
index d76af0ac13..32ee107e7b 100644
--- a/package/boot/uboot-oxnas/Makefile
+++ b/package/boot/uboot-oxnas/Makefile
@@ -8,95 +8,29 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
-PKG_NAME:=u-boot
PKG_VERSION:=2014.10
PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
- http://mirror2.openwrt.org/sources \
- ftp://ftp.denx.de/pub/u-boot
-
PKG_HASH:=d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
-
+include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
-define uboot/Default
- TITLE:=
- CONFIG:=
- IMAGE:=
-endef
-
-define uboot/ox820
- TITLE:=U-Boot for the Oxford/PLX NAS7820
-endef
-
-UBOOTS:=ox820
-
-define Package/uboot/template
-define Package/uboot-oxnas-$(1)
- SECTION:=boot
- CATEGORY:=Boot Loaders
- DEPENDS:=@TARGET_oxnas
- TITLE:=$(2)
- URL:=http://www.denx.de/wiki/U-Boot
- VARIANT:=$(1)
- MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-endef
+define U-Boot/Default
+ BUILD_TARGET:=oxnas
+ BUILD_DEVICES:=Default
+ HIDDEN:=y
endef
-define BuildUBootPackage
- $(eval $(uboot/Default))
- $(eval $(uboot/$(1)))
- $(call Package/uboot/template,$(1),$(TITLE))
+define U-Boot/ox820
+ NAME:=Oxford/PLX NAS7820
endef
-ifdef BUILD_VARIANT
-$(eval $(call uboot/$(BUILD_VARIANT)))
-UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
-UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin)
-endif
-
-define Build/Prepare
- $(call Build/Prepare/Default)
- $(CP) ./files/* $(PKG_BUILD_DIR)
- find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
-endef
+UBOOT_TARGETS:=ox820
-define Build/Configure
- $(MAKE) -C $(PKG_BUILD_DIR) \
- $(UBOOT_CONFIG)_config
-endef
-
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- u-boot.bin \
- CROSS_COMPILE=$(TARGET_CROSS)
-endef
-
-define Package/uboot/install/default
- $(INSTALL_DIR) $(BIN_DIR)
- $(CP) $(PKG_BUILD_DIR)/u-boot.bin \
- $(BIN_DIR)/openwrt-$(BOARD)-$(1)-u-boot.bin
+define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/u-boot.bin \
$(KERNEL_BUILD_DIR)/u-boot.bin
endef
-define Package/uboot/install/template
-define Package/uboot-oxnas-$(1)/install
- $(call Package/uboot/install/default,$(2))
-endef
-endef
-
-$(foreach u,$(UBOOTS), \
- $(eval $(call Package/uboot/install/template,$(u),$(u))) \
-)
-
-$(foreach u,$(UBOOTS), \
- $(eval $(call BuildUBootPackage,$(u))) \
- $(eval $(call BuildPackage,uboot-oxnas-$(u))) \
-)
+$(eval $(call BuildPackage/U-Boot))
diff --git a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/Makefile b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/Makefile
index 4c32f5cb21..4c32f5cb21 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/Makefile
+++ b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/Makefile
diff --git a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/clock.c b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/clock.c
index 8974ca0296..8974ca0296 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/clock.c
+++ b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/clock.c
diff --git a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/pinmux.c b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/pinmux.c
index a6f5e9abc4..a6f5e9abc4 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/pinmux.c
+++ b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/pinmux.c
diff --git a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/reset.c b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/reset.c
index 276c912383..276c912383 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/reset.c
+++ b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/reset.c
diff --git a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/timer.c b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/timer.c
index 5e876080db..5e876080db 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/timer.c
+++ b/package/boot/uboot-oxnas/src/arch/arm/cpu/arm1136/nas782x/timer.c
diff --git a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/clock.h b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/clock.h
index da7dd1c063..da7dd1c063 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/clock.h
+++ b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/clock.h
diff --git a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/cpu.h b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/cpu.h
index 11e803c5c0..11e803c5c0 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/cpu.h
+++ b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/cpu.h
diff --git a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/hardware.h b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/hardware.h
index f26b17f062..f26b17f062 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/hardware.h
+++ b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/hardware.h
diff --git a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/pinmux.h b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/pinmux.h
index 810ba5cbab..810ba5cbab 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/pinmux.h
+++ b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/pinmux.h
diff --git a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/spl.h b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/spl.h
index f73afdab4f..f73afdab4f 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/spl.h
+++ b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/spl.h
diff --git a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/sysctl.h b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/sysctl.h
index 3867e45f92..3867e45f92 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/sysctl.h
+++ b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/sysctl.h
diff --git a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/timer.h b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/timer.h
index ea4d71e164..ea4d71e164 100644
--- a/package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/timer.h
+++ b/package/boot/uboot-oxnas/src/arch/arm/include/asm/arch-nas782x/timer.h
diff --git a/package/boot/uboot-oxnas/files/board/ox820/Kconfig b/package/boot/uboot-oxnas/src/board/ox820/Kconfig
index 8f631aa67b..8f631aa67b 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/Kconfig
+++ b/package/boot/uboot-oxnas/src/board/ox820/Kconfig
diff --git a/package/boot/uboot-oxnas/files/board/ox820/MAINTAINERS b/package/boot/uboot-oxnas/src/board/ox820/MAINTAINERS
index a86ba2695a..a86ba2695a 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/MAINTAINERS
+++ b/package/boot/uboot-oxnas/src/board/ox820/MAINTAINERS
diff --git a/package/boot/uboot-oxnas/files/board/ox820/Makefile b/package/boot/uboot-oxnas/src/board/ox820/Makefile
index 445fc4c7da..445fc4c7da 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/Makefile
+++ b/package/boot/uboot-oxnas/src/board/ox820/Makefile
diff --git a/package/boot/uboot-oxnas/files/board/ox820/ddr.c b/package/boot/uboot-oxnas/src/board/ox820/ddr.c
index a665722e3b..a665722e3b 100755
--- a/package/boot/uboot-oxnas/files/board/ox820/ddr.c
+++ b/package/boot/uboot-oxnas/src/board/ox820/ddr.c
diff --git a/package/boot/uboot-oxnas/files/board/ox820/ddr.h b/package/boot/uboot-oxnas/src/board/ox820/ddr.h
index a3c199019c..a3c199019c 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/ddr.h
+++ b/package/boot/uboot-oxnas/src/board/ox820/ddr.h
diff --git a/package/boot/uboot-oxnas/files/board/ox820/lowlevel_init.S b/package/boot/uboot-oxnas/src/board/ox820/lowlevel_init.S
index 3328b7aa86..3328b7aa86 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/lowlevel_init.S
+++ b/package/boot/uboot-oxnas/src/board/ox820/lowlevel_init.S
diff --git a/package/boot/uboot-oxnas/files/board/ox820/ox820.c b/package/boot/uboot-oxnas/src/board/ox820/ox820.c
index f93cc9ca58..f93cc9ca58 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/ox820.c
+++ b/package/boot/uboot-oxnas/src/board/ox820/ox820.c
diff --git a/package/boot/uboot-oxnas/files/board/ox820/spl_start.S b/package/boot/uboot-oxnas/src/board/ox820/spl_start.S
index 2eab3f56d8..2eab3f56d8 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/spl_start.S
+++ b/package/boot/uboot-oxnas/src/board/ox820/spl_start.S
diff --git a/package/boot/uboot-oxnas/files/board/ox820/u-boot-spl.lds b/package/boot/uboot-oxnas/src/board/ox820/u-boot-spl.lds
index a8d90dfba7..a8d90dfba7 100644
--- a/package/boot/uboot-oxnas/files/board/ox820/u-boot-spl.lds
+++ b/package/boot/uboot-oxnas/src/board/ox820/u-boot-spl.lds
diff --git a/package/boot/uboot-oxnas/files/common/env_ext4.c b/package/boot/uboot-oxnas/src/common/env_ext4.c
index e98d94dae9..e98d94dae9 100644
--- a/package/boot/uboot-oxnas/files/common/env_ext4.c
+++ b/package/boot/uboot-oxnas/src/common/env_ext4.c
diff --git a/package/boot/uboot-oxnas/files/common/spl/spl_block.c b/package/boot/uboot-oxnas/src/common/spl/spl_block.c
index f16413aff7..f16413aff7 100644
--- a/package/boot/uboot-oxnas/files/common/spl/spl_block.c
+++ b/package/boot/uboot-oxnas/src/common/spl/spl_block.c
diff --git a/package/boot/uboot-oxnas/files/configs/ox820_defconfig b/package/boot/uboot-oxnas/src/configs/ox820_defconfig
index 48a16d0c25..48a16d0c25 100644
--- a/package/boot/uboot-oxnas/files/configs/ox820_defconfig
+++ b/package/boot/uboot-oxnas/src/configs/ox820_defconfig
diff --git a/package/boot/uboot-oxnas/files/drivers/block/plxsata_ide.c b/package/boot/uboot-oxnas/src/drivers/block/plxsata_ide.c
index 7e0e78f713..7e0e78f713 100644
--- a/package/boot/uboot-oxnas/files/drivers/block/plxsata_ide.c
+++ b/package/boot/uboot-oxnas/src/drivers/block/plxsata_ide.c
diff --git a/package/boot/uboot-oxnas/files/drivers/usb/host/ehci-oxnas.c b/package/boot/uboot-oxnas/src/drivers/usb/host/ehci-oxnas.c
index 6ab05c5116..6ab05c5116 100644
--- a/package/boot/uboot-oxnas/files/drivers/usb/host/ehci-oxnas.c
+++ b/package/boot/uboot-oxnas/src/drivers/usb/host/ehci-oxnas.c
diff --git a/package/boot/uboot-oxnas/files/include/configs/ox820.h b/package/boot/uboot-oxnas/src/include/configs/ox820.h
index 85ee3b4cd5..85ee3b4cd5 100644
--- a/package/boot/uboot-oxnas/files/include/configs/ox820.h
+++ b/package/boot/uboot-oxnas/src/include/configs/ox820.h
diff --git a/package/boot/uboot-oxnas/files/tools/mkox820crc.c b/package/boot/uboot-oxnas/src/tools/mkox820crc.c
index d100191f2d..d100191f2d 100644
--- a/package/boot/uboot-oxnas/files/tools/mkox820crc.c
+++ b/package/boot/uboot-oxnas/src/tools/mkox820crc.c