From b27241a1a1b70e6b84f76b2233283f7ec727c224 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 22 Jan 2017 19:36:00 +0100
Subject: [PATCH] uboot-lantiq: switch to using u-boot.mk

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 package/boot/uboot-lantiq/Makefile | 468 +++++++++++++----------------
 1 file changed, 209 insertions(+), 259 deletions(-)

diff --git a/package/boot/uboot-lantiq/Makefile b/package/boot/uboot-lantiq/Makefile
index 401e77ab8e..dd101838a1 100644
--- a/package/boot/uboot-lantiq/Makefile
+++ b/package/boot/uboot-lantiq/Makefile
@@ -11,336 +11,323 @@ PKG_NAME:=u-boot
 PKG_VERSION:=2013.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:=0d71e62beb952b41ebafb20a7ee4df2f960db64c31b054721ceb79ff14014c55
-PKG_TARGETS:=bin
-
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
-
-PKG_BUILD_PARALLEL:=1
 
 FIRMWARE_LANTIQ_SOURCE:=$(TOPDIR)/target/linux/lantiq/files/firmware/lantiq
 
+include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
 
-define uboot/Default
-  TITLE:=
-  SOC:=
+define U-Boot/Default
+  BUILD_TARGET:=lantiq
   DDR_SETTINGS:=
-  IMAGE:=
-  DEPS:=
 endef
 
-define uboot/arv4519pw_ram
-  TITLE:=U-Boot for Arcadyan arv4519pw (RAM)
-  SOC:=danube
+define U-Boot/arv4519pw_ram
+  NAME:=Arcadyan arv4519pw (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV4519PW
   DDR_SETTINGS:=board/arcadyan/arv4519pw/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/arv4519pw_nor
-  TITLE:=U-Boot for Arcadyan arv4519pw (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv4519pw_nor
+  NAME:=Arcadyan arv4519pw (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV4519PW
 endef
 
-define uboot/arv4519pw_brn
-  TITLE:=U-Boot for Arcadyan arv4519pw (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv4519pw_brn
+  NAME:=Arcadyan arv4519pw (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV4519PW
 endef
 
-define uboot/arv7506pw11_ram
-  TITLE:=U-Boot for Arcadyan ARV7506PW11 (RAM)
-  SOC:=danube
+define U-Boot/arv7506pw11_ram
+  NAME:=Arcadyan ARV7506PW11 (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7506PW11
   DDR_SETTINGS:=board/arcadyan/arv7506pw11/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/arv7506pw11_nor
-  TITLE:=U-Boot for Arcadyan ARV7506PW11 (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7506pw11_nor
+  NAME:=Arcadyan ARV7506PW11 (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7506PW11
 endef
 
-define uboot/arv7506pw11_brn
-  TITLE:=U-Boot for Arcadyan ARV7506PW11 (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7506pw11_brn
+  NAME:=Arcadyan ARV7506PW11 (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7506PW11
 endef
 
-define uboot/arv7510pw_ram
-  TITLE:=U-Boot for Arcadyan arv7510pw (RAM)
-  SOC:=danube
+define U-Boot/arv7510pw_ram
+  NAME:=Arcadyan arv7510pw (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV4510PW
   DDR_SETTINGS:=board/arcadyan/arv7510pw/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/arv7510pw_nor
-  TITLE:=U-Boot for Arcadyan arv7510pw (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7510pw_nor
+  NAME:=Arcadyan arv7510pw (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV4510PW
 endef
 
-define uboot/arv7510pw_brn
-  TITLE:=U-Boot for Arcadyan arv7510pw (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7510pw_brn
+  NAME:=Arcadyan arv7510pw (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV4510PW
 endef
 
-define uboot/arv7510pw22_ram
-  TITLE:=U-Boot for Arcadyan arv7510pw22 (RAM)
-  SOC:=danube
+define U-Boot/arv7510pw22_ram
+  NAME:=Arcadyan arv7510pw22 (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7510PW22
   DDR_SETTINGS:=board/arcadyan/arv7510pw22/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/arv7510pw22_nor
-  TITLE:=U-Boot for Arcadyan arv7510pw22 (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7510pw22_nor
+  NAME:=Arcadyan arv7510pw22 (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7510PW22
 endef
 
-define uboot/arv7510pw22_brn
-  TITLE:=U-Boot for Arcadyan arv7510pw22 (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7510pw22_brn
+  NAME:=Arcadyan arv7510pw22 (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7510PW22
 endef
 
-define uboot/arv7518pw_ram
-  TITLE:=U-Boot for Arcadyan arv7518pw (RAM)
-  SOC:=danube
+define U-Boot/arv7518pw_ram
+  NAME:=Arcadyan arv7518pw (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7518PW
   DDR_SETTINGS:=board/arcadyan/arv7518pw/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/arv7518pw_nor
-  TITLE:=U-Boot for Arcadyan arv7518pw (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7518pw_nor
+  NAME:=Arcadyan arv7518pw (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7518PW
 endef
 
-define uboot/arv7518pw_brn
-  TITLE:=U-Boot for Arcadyan arv7518pw (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv7518pw_brn
+  NAME:=Arcadyan arv7518pw (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV7518PW
 endef
 
-define uboot/arv752dpw_ram
-  TITLE:=U-Boot for Arcadyan arv752dpw (RAM)
-  SOC:=danube
+define U-Boot/arv752dpw_ram
+  NAME:=Arcadyan arv752dpw (RAM)
+  BUILD_SUBTARGET:=xway
   DDR_SETTINGS:=board/arcadyan/arv752dpw/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
+  BUILD_DEVICES:=ARV752DPW
 endef
 
-define uboot/arv752dpw_nor
-  TITLE:=U-Boot for Arcadyan arv752dpw (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv752dpw_nor
+  NAME:=Arcadyan arv752dpw (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV752DPW
 endef
 
-define uboot/arv752dpw_brn
-  TITLE:=U-Boot for Arcadyan arv752dpw (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv752dpw_brn
+  NAME:=Arcadyan arv752dpw (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV752DPW
 endef
 
-define uboot/arv752dpw22_ram
-  TITLE:=U-Boot for Arcadyan arv752dpw22 (RAM)
-  SOC:=danube
+define U-Boot/arv752dpw22_ram
+  NAME:=Arcadyan arv752dpw22 (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV752DPW22
   DDR_SETTINGS:=board/arcadyan/arv752dpw22/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/arv752dpw22_nor
-  TITLE:=U-Boot for Arcadyan arv752dpw22 (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv752dpw22_nor
+  NAME:=Arcadyan arv752dpw22 (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV752DPW22
 endef
 
-define uboot/arv752dpw22_brn
-  TITLE:=U-Boot for Arcadyan arv752dpw22 (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv752dpw22_brn
+  NAME:=Arcadyan arv752dpw22 (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV752DPW22
 endef
 
-define uboot/arv8539pw22_ram
-  TITLE:=U-Boot for Speedport W 504V Typ A (RAM)
-  SOC:=danube
+define U-Boot/arv8539pw22_ram
+  NAME:=Speedport W 504V Typ A (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV8539PW22
   DDR_SETTINGS:=board/arcadyan/arv8539pw22/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/arv8539pw22_nor
-  TITLE:=U-Boot for Speedport W 504V Typ A (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv8539pw22_nor
+  NAME:=Speedport W 504V Typ A (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV8539PW22
 endef
 
-define uboot/arv8539pw22_brn
-  TITLE:=U-Boot for Speedport W 504V Typ A (BRN)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/arv8539pw22_brn
+  NAME:=Speedport W 504V Typ A (BRN)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ARV8539PW22
 endef
 
-define uboot/gigasx76x_ram
-  TITLE:=U-Boot for Siemens Gigaset sx76x (RAM)
-  SOC:=danube
+define U-Boot/gigasx76x_ram
+  NAME:=Siemens Gigaset sx76x (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=GIGASX76X
   DDR_SETTINGS:=board/gigaset/sx76x/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/gigasx76x_nor
-  TITLE:=U-Boot for Siemens Gigaset sx76x (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/gigasx76x_nor
+  NAME:=Siemens Gigaset sx76x (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=GIGASX76X
 endef
 
-define uboot/acmp252_ram
-  TITLE:=U-Boot for AudioCodes MP-252 (RAM)
-  SOC:=danube
+define U-Boot/acmp252_ram
+  NAME:=AudioCodes MP-252 (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ACMP252
   DDR_SETTINGS:=board/audiocodes/acmp252/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/acmp252_nor
-  TITLE:=U-Boot for AudioCodes MP-252 (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/acmp252_nor
+  NAME:=AudioCodes MP-252 (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=ACMP252
 endef
 
-define uboot/bthomehubv5a_ram
-  TITLE:=U-Boot for BT Home Hub 5A (RAM)
-  SOC:=vr9
+define U-Boot/bthomehubv5a_ram
+  NAME:=BT Home Hub 5A (RAM)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=BTHOMEHUBV5A
   DDR_SETTINGS:=board/bt/bthomehubv5a/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xrx200
 endef
 
-define uboot/easy50712_ram
-  TITLE:=U-Boot for Lantiq EASY50712 (RAM)
-  SOC:=danube
+define U-Boot/easy50712_ram
+  NAME:=Lantiq EASY50712 (RAM)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=EASY50712
   DDR_SETTINGS:=board/lantiq/easy50712/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xway
 endef
 
-define uboot/easy50712_nor
-  TITLE:=U-Boot for Lantiq EASY50712 (NOR)
-  SOC:=danube
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/easy50712_nor
+  NAME:=Lantiq EASY50712 (NOR)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=EASY50712
 endef
 
-define uboot/easy50712_norspl
-  TITLE:=U-Boot for Lantiq EASY50712 (NOR SPL)
-  SOC:=danube
-  IMAGE:=u-boot.ltq.lzo.norspl
-  DEPS:=@TARGET_lantiq_xway
+define U-Boot/easy50712_norspl
+  NAME:=Lantiq EASY50712 (NOR SPL)
+  BUILD_SUBTARGET:=xway
+  BUILD_DEVICES:=EASY50712
+  UBOOT_IMAGE:=u-boot.ltq.lzo.norspl
 endef
 
-define uboot/easy80920_ram
-  TITLE:=U-Boot for Lantiq EASY80920 (RAM)
-  SOC:=vr9
+define U-Boot/easy80920_ram
+  NAME:=Lantiq EASY80920 (RAM)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=EASY80920NOR EASY80920NAND
   DDR_SETTINGS:=board/lantiq/easy80920/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xrx200
 endef
 
-define uboot/easy80920_nor
-  TITLE:=U-Boot for Lantiq EASY80920 (NOR)
-  SOC:=vr9
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/easy80920_nor
+  NAME:=Lantiq EASY80920 (NOR)
+  BUILD_DEVICES:=EASY80920NOR EASY80920NAND
+  BUILD_SUBTARGET:=xrx200
 endef
 
-define uboot/easy80920_norspl
-  TITLE:=U-Boot for Lantiq EASY80920 (NOR SPL)
-  SOC:=vr9
-  IMAGE:=u-boot.ltq.lzo.norspl
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/easy80920_norspl
+  NAME:=Lantiq EASY80920 (NOR SPL)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=EASY80920NOR EASY80920NAND
+  UBOOT_IMAGE:=u-boot.ltq.lzo.norspl
 endef
 
-define uboot/easy80920_sfspl
-  TITLE:=U-Boot for Lantiq EASY80920 (SPI SPL)
-  SOC:=vr9
-  IMAGE:=u-boot.ltq.lzo.sfspl
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/easy80920_sfspl
+  NAME:=Lantiq EASY80920 (SPI SPL)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=EASY80920NOR EASY80920NAND
+  UBOOT_IMAGE:=u-boot.ltq.lzo.sfspl
 endef
 
-define uboot/fb3370_eva
-  TITLE:=U-Boot for AVM FRITZ3370 (EVA)
-  SOC:=vr9
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/fb3370_eva
+  NAME:=AVM FRITZ3370 (EVA)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=FRITZ3370
 endef
 
-define uboot/fb3370_ram
-  TITLE:=U-Boot for AVM FRITZ3370 (RAM)
-  SOC:=vr9
+define U-Boot/fb3370_ram
+  NAME:=AVM FRITZ3370 (RAM)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=FRITZ3370
   DDR_SETTINGS:=board/avm/fb3370/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xrx200
 endef
 
-define uboot/fb3370_sfspl
-  TITLE:=U-Boot for AVM FRITZ3370 (SPI SPL)
-  SOC:=vr9
-  IMAGE:=u-boot.ltq.lzo.sfspl
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/fb3370_sfspl
+  NAME:=AVM FRITZ3370 (SPI SPL)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=FRITZ3370
+  UBOOT_IMAGE:=u-boot.ltq.lzo.sfspl
 endef
 
-define uboot/p2812hnufx_ram
-  TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (RAM)
-  SOC:=vr9
+define U-Boot/p2812hnufx_ram
+  NAME:=ZyXEL P-2812HNU-Fx (RAM)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=P2812HNUF1
   DDR_SETTINGS:=board/zyxel/p2812hnufx/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xrx200
 endef
 
-define uboot/p2812hnufx_nandspl
-  TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (NAND SPL)
-  SOC:=vr9
-  IMAGE:=u-boot.ltq.lzo.nandspl
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/p2812hnufx_nandspl
+  NAME:=ZyXEL P-2812HNU-Fx (NAND SPL)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=P2812HNUF1
+  UBOOT_IMAGE:=u-boot.ltq.lzo.nandspl
 endef
 
-define uboot/vgv7510kw22_brn
-  TITLE:=U-Boot for Arcadyan VGV7510KW22 (BRN)
-  SOC:=vr9
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/vgv7510kw22_brn
+  NAME:=Arcadyan VGV7510KW22 (BRN)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=VGV7510KW22NOR
 endef
 
-define uboot/vgv7510kw22_nor
-  TITLE:=U-Boot for Arcadyan VGV7510KW22 (NOR)
-  SOC:=vr9
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/vgv7510kw22_nor
+  NAME:=Arcadyan VGV7510KW22 (NOR)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=VGV7510KW22NOR
 endef
 
-define uboot/vgv7510kw22_ram
-  TITLE:=U-Boot for Arcadyan VGV7510KW22 (RAM)
-  SOC:=vr9
+define U-Boot/vgv7510kw22_ram
+  NAME:=Arcadyan VGV7510KW22 (RAM)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=VGV7510KW22NOR
   DDR_SETTINGS:=board/arcadyan/vgv7510kw22/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xrx200
 endef
 
-define uboot/vgv7519_brn
-  TITLE:=U-Boot for Arcadyan VGV7519 (BRN)
-  SOC:=vr9
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/vgv7519_brn
+  NAME:=Arcadyan VGV7519 (BRN)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=VGV7519NOR VGV7519BRN
 endef
 
-define uboot/vgv7519_nor
-  TITLE:=U-Boot for Arcadyan VGV7519 (NOR)
-  SOC:=vr9
-  DEPS:=@TARGET_lantiq_xrx200
+define U-Boot/vgv7519_nor
+  NAME:=Arcadyan VGV7519 (NOR)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=VGV7519NOR VGV7519BRN
 endef
 
-define uboot/vgv7519_ram
-  TITLE:=U-Boot for Arcadyan VGV7519 (RAM)
-  SOC:=vr9
+define U-Boot/vgv7519_ram
+  NAME:=Arcadyan VGV7519 (RAM)
+  BUILD_SUBTARGET:=xrx200
+  BUILD_DEVICES:=VGV7519NOR VGV7519BRN
   DDR_SETTINGS:=board/arcadyan/vgv7519/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xrx200
 endef
 
-UBOOTS:= \
+UBOOT_TARGETS:= \
 	arv4519pw_ram arv4519pw_nor arv4519pw_brn \
 	arv7506pw11_ram arv7506pw11_nor arv7506pw11_brn \
 	arv7510pw_ram arv7510pw_nor arv7510pw_brn \
@@ -359,25 +346,6 @@ UBOOTS:= \
 	vgv7510kw22_brn vgv7510kw22_nor vgv7510kw22_ram \
 	vgv7519_brn vgv7519_nor vgv7519_ram
 
-define Package/uboot/template
-define Package/uboot-lantiq-$(1)
-  SECTION:=boot
-  CATEGORY:=Boot Loaders
-  DEPENDS:=$(3) @!IN_SDK
-  TITLE:=$(2)
-  URL:=http://www.denx.de/wiki/U-Boot
-  VARIANT:=$(1)
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-endef
-
-define BuildUBootPackage
-	$(eval $(uboot/Default))
-	$(eval $(uboot/$(1)))
-	DEPS:=$(uboot/$(1)/DEPS)
-	$(call Package/uboot/template,$(1),$(TITLE),$(DEPS))
-endef
-
 define CompressVR9Firmware
 	$(STAGING_DIR_HOST)/bin/lzma e \
 		$(FIRMWARE_LANTIQ_SOURCE)/vr9_phy$(1)_a$(2)x.bin \
@@ -393,41 +361,23 @@ define Build/Prepare
 	$(call CompressVR9Firmware,22f,2)
 endef
 
-define Build/Configure
-	$(MAKE) -C $(PKG_BUILD_DIR) $(BUILD_VARIANT)_config
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS)
-endef
-
-define Package/uboot/install/default
-	$(INSTALL_DIR) $$(1)
-	$(CP) \
-		$(PKG_BUILD_DIR)/$(2) \
-		$$(1)/openwrt-$(BOARD)-$(1)-u-boot.img
-endef
+ifeq ($(SUBTARGET),xway)
+  SOC:=danube
+else
+  SOC:=vr9
+endif
 
-define Package/uboot/install/uart
+define Package/u-boot/install/uart
 	awk -f $(PKG_BUILD_DIR)/tools/lantiq_ram_init_uart.awk \
-		-v soc=$(2) $(PKG_BUILD_DIR)/$(3) \
+		-v soc=$(SOC) $(PKG_BUILD_DIR)/$(DDR_SETTINGS) \
 		> $(PKG_BUILD_DIR)/ddr_settings
 	perl $(PKG_BUILD_DIR)/tools/gct.pl \
 		$(PKG_BUILD_DIR)/ddr_settings $(PKG_BUILD_DIR)/u-boot.srec \
-		$$(1)/openwrt-$(BOARD)-$(1)-u-boot.asc
- endef
-
-define Package/uboot/install/template
-define Package/uboot-lantiq-$(1)/install
-	$(call Package/uboot/install/default,$(1),$(if $(IMAGE),$(IMAGE),u-boot.bin))
-	$(if $(DDR_SETTINGS), \
-		$(call Package/uboot/install/uart,$(1),$(SOC),$(DDR_SETTINGS)) \
-	)
+		$(1)/u-boot.asc
 endef
+
+define Package/u-boot/install
+	$(Package/u-boot/install/$(if $(DDR_SETTINGS),uart,default))
 endef
 
-$(foreach u,$(UBOOTS), \
-	$(eval $(call BuildUBootPackage,$(u))) \
-	$(eval $(call Package/uboot/install/template,$(u))) \
-	$(eval $(call BuildPackage,uboot-lantiq-$(u))) \
-)
+$(eval $(call BuildPackage/U-Boot))
-- 
2.30.2