forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: target/rockchip: drop ugly hacks (sync with official) (coolsnowwolf#5218) UnblockNeteaseMusicGo: bump to 0.2.4 (coolsnowwolf#5214)
- Loading branch information
Showing
51 changed files
with
1,476 additions
and
7,015 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,59 +5,68 @@ | |
include $(TOPDIR)/rules.mk | ||
include $(INCLUDE_DIR)/kernel.mk | ||
|
||
PKG_VERSION:=2020.04 | ||
PKG_VERSION:=2020.07 | ||
|
||
PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 | ||
PKG_HASH:=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a | ||
|
||
PKG_MAINTAINER:=Tobias Maedel <[email protected]> | ||
|
||
include $(INCLUDE_DIR)/u-boot.mk | ||
include $(INCLUDE_DIR)/package.mk | ||
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip | ||
|
||
define U-Boot/Default | ||
BUILD_TARGET:=rockchip | ||
UENV:=default | ||
HIDDEN:=1 | ||
endef | ||
|
||
|
||
# RK3328 boards | ||
|
||
define U-Boot/nanopi-r2s-rk3328 | ||
BUILD_SUBTARGET:=armv8 | ||
NAME:=NanoPi R2S | ||
BUILD_DEVICES:= \ | ||
friendlyarm_nanopi-r2s | ||
BL31=$(STAGING_DIR_IMAGE)/rk3328_bl31.elf | ||
DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rockchip | ||
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip | ||
ATF:=rk3328_bl31.elf | ||
OF_PLATDATA:=$(1) | ||
endef | ||
|
||
define U-Boot/rock-pi-e-rk3328 | ||
BUILD_SUBTARGET:=armv8 | ||
NAME:=Rock Pi E | ||
BUILD_DEVICES:= \ | ||
radxa_rock-pi-e | ||
BL31=$(STAGING_DIR_IMAGE)/rk3328_bl31.elf | ||
endef | ||
|
||
# RK3399 boards | ||
|
||
define U-Boot/rockpro64-rk3399 | ||
BUILD_SUBTARGET:=armv8 | ||
NAME:=RockPro64 | ||
BUILD_DEVICES:= \ | ||
pine64_rockpro64 | ||
BL31=$(STAGING_DIR_IMAGE)/rk3399_bl31.elf | ||
DEPENDS:=+PACKAGE_u-boot-rockpro64-rk3399:arm-trusted-firmware-rockchip | ||
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip | ||
ATF:=rk3399_bl31.elf | ||
endef | ||
|
||
UBOOT_TARGETS := \ | ||
nanopi-r2s-rk3328 \ | ||
rock-pi-e-rk3328 \ | ||
rockpro64-rk3399 | ||
rockpro64-rk3399 \ | ||
nanopi-r2s-rk3328 | ||
|
||
UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes | ||
|
||
UBOOT_MAKE_FLAGS += \ | ||
BL31=$(BL31) | ||
BL31=$(STAGING_DIR_IMAGE)/$(ATF) | ||
|
||
define Build/Configure | ||
echo CONFIG_CMD_SETEXPR=y >> $(PKG_BUILD_DIR)/configs/$(UBOOT_CONFIG)_defconfig | ||
$(call Build/Configure/U-Boot) | ||
|
||
ifneq ($(OF_PLATDATA),) | ||
mkdir -p $(PKG_BUILD_DIR)/tpl/dts | ||
mkdir -p $(PKG_BUILD_DIR)/include/generated | ||
|
||
$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-platdata.c $(PKG_BUILD_DIR)/tpl/dts/dt-platdata.c | ||
$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-structs-gen.h $(PKG_BUILD_DIR)/include/generated/dt-structs-gen.h | ||
endif | ||
|
||
$(SED) 's#CONFIG_MKIMAGE_DTC_PATH=.*#CONFIG_MKIMAGE_DTC_PATH="$(PKG_BUILD_DIR)/scripts/dtc/dtc"#g' $(PKG_BUILD_DIR)/.config | ||
echo 'CONFIG_IDENT_STRING=" OpenWrt"' >> $(PKG_BUILD_DIR)/.config | ||
endef | ||
|
65 changes: 0 additions & 65 deletions
65
package/boot/uboot-rockchip/patches/001-rockchip-Avoid-using-libfdt-with-of-platdata.diff
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
package/boot/uboot-rockchip/patches/001-scripts-remove-dependency-on-swig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From b137ca16b54c67d76714ea5a0138741959b0dc29 Mon Sep 17 00:00:00 2001 | ||
From: David Bauer <[email protected]> | ||
Date: Mon, 13 Jul 2020 23:37:37 +0200 | ||
Subject: [PATCH] scripts: remove dependency on swig | ||
|
||
Don't build the libfdt tool, as it has a dependency on swig (which | ||
OpenWrt does not ship). | ||
|
||
This requires more hacks, as of-platdata generation does not work | ||
without it. | ||
|
||
Signed-off-by: David Bauer <[email protected]> | ||
--- | ||
scripts/dtc/Makefile | 2 -- | ||
1 file changed, 2 deletions(-) | ||
|
||
--- a/scripts/dtc/Makefile | ||
+++ b/scripts/dtc/Makefile | ||
@@ -18,5 +18,3 @@ HOSTCFLAGS_dtc-parser.tab.o := -I$(src) | ||
# dependencies on generated files need to be listed explicitly | ||
$(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h | ||
|
||
-# Added for U-Boot | ||
-subdir-$(CONFIG_PYLIBFDT) += pylibfdt |
41 changes: 0 additions & 41 deletions
41
...t/uboot-rockchip/patches/002-dm-core-Don-t-include-ofnode-functions-with-of-platdata.diff
This file was deleted.
Oops, something went wrong.
32 changes: 32 additions & 0 deletions
32
package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 55273cf6079ddd3b006da69f0113c2c66c03f17e Mon Sep 17 00:00:00 2001 | ||
From: David Bauer <[email protected]> | ||
Date: Tue, 14 Jul 2020 22:44:22 +0200 | ||
Subject: [PATCH] spl: remove dtoc of-pdata generation | ||
|
||
Remove the dtoc of-pdata generation. This generation is dependant on | ||
libpython-dev. As OpenWrt does not ship with this dependency, use | ||
pre-generated pdata files and remove the generation from the | ||
build-process. | ||
|
||
This only affects RK3328 boards. | ||
|
||
Signed-off-by: David Bauer <[email protected]> | ||
--- | ||
scripts/Makefile.spl | 6 ------ | ||
1 file changed, 6 deletions(-) | ||
|
||
--- a/scripts/Makefile.spl | ||
+++ b/scripts/Makefile.spl | ||
@@ -320,12 +320,6 @@ PHONY += dts_dir | ||
dts_dir: | ||
$(shell [ -d $(obj)/dts ] || mkdir -p $(obj)/dts) | ||
|
||
-include/generated/dt-structs-gen.h: $(obj)/$(SPL_BIN).dtb dts_dir FORCE | ||
- $(call if_changed,dtoch) | ||
- | ||
-$(obj)/dts/dt-platdata.c: $(obj)/$(SPL_BIN).dtb dts_dir FORCE | ||
- $(call if_changed,dtocc) | ||
- | ||
ifdef CONFIG_SAMSUNG | ||
ifdef CONFIG_VAR_SIZE_SPL | ||
VAR_SIZE_PARAM = --vs |
22 changes: 0 additions & 22 deletions
22
.../boot/uboot-rockchip/patches/003-spl-Allow-SPL-TPL-to-use-of-platdata-without-libfdt.diff
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.