[source] uboot-oxnas: switch to u-boot.mk
LEDE Commits
lede-commits at lists.infradead.org
Tue Jan 24 07:21:59 PST 2017
nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/bb88ec947fc7f4db6ada9ccccb0c4d09c75742b0
commit bb88ec947fc7f4db6ada9ccccb0c4d09c75742b0
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Jan 23 12:40:32 2017 +0100
uboot-oxnas: switch to u-boot.mk
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
package/boot/uboot-oxnas/Makefile | 86 +++-------------------
.../arch/arm/cpu/arm1136/nas782x/Makefile | 0
.../arch/arm/cpu/arm1136/nas782x/clock.c | 0
.../arch/arm/cpu/arm1136/nas782x/pinmux.c | 0
.../arch/arm/cpu/arm1136/nas782x/reset.c | 0
.../arch/arm/cpu/arm1136/nas782x/timer.c | 0
.../arch/arm/include/asm/arch-nas782x/clock.h | 0
.../arch/arm/include/asm/arch-nas782x/cpu.h | 0
.../arch/arm/include/asm/arch-nas782x/hardware.h | 0
.../arch/arm/include/asm/arch-nas782x/pinmux.h | 0
.../arch/arm/include/asm/arch-nas782x/spl.h | 0
.../arch/arm/include/asm/arch-nas782x/sysctl.h | 0
.../arch/arm/include/asm/arch-nas782x/timer.h | 0
.../uboot-oxnas/{files => src}/board/ox820/Kconfig | 0
.../{files => src}/board/ox820/MAINTAINERS | 0
.../{files => src}/board/ox820/Makefile | 0
.../uboot-oxnas/{files => src}/board/ox820/ddr.c | 0
.../uboot-oxnas/{files => src}/board/ox820/ddr.h | 0
.../{files => src}/board/ox820/lowlevel_init.S | 0
.../uboot-oxnas/{files => src}/board/ox820/ox820.c | 0
.../{files => src}/board/ox820/spl_start.S | 0
.../{files => src}/board/ox820/u-boot-spl.lds | 0
.../uboot-oxnas/{files => src}/common/env_ext4.c | 0
.../{files => src}/common/spl/spl_block.c | 0
.../{files => src}/configs/ox820_defconfig | 0
.../{files => src}/drivers/block/plxsata_ide.c | 0
.../{files => src}/drivers/usb/host/ehci-oxnas.c | 0
.../{files => src}/include/configs/ox820.h | 0
.../uboot-oxnas/{files => src}/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 d76af0a..32ee107 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 at 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/Makefile
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/clock.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/pinmux.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/reset.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/timer.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/clock.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/cpu.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/hardware.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/pinmux.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/spl.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/sysctl.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/timer.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/Kconfig
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/MAINTAINERS
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/Makefile
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/ddr.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/ddr.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/lowlevel_init.S
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/ox820.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/spl_start.S
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/board/ox820/u-boot-spl.lds
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/common/env_ext4.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/common/spl/spl_block.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/configs/ox820_defconfig
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/drivers/block/plxsata_ide.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/drivers/usb/host/ehci-oxnas.c
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/include/configs/ox820.h
rename to 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
similarity index 100%
rename from package/boot/uboot-oxnas/files/tools/mkox820crc.c
rename to package/boot/uboot-oxnas/src/tools/mkox820crc.c
More information about the lede-commits
mailing list