forked from armbian/build
-
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.
xt-q8l-v10: rewrite u-boot patches, no changes
- Loading branch information
1 parent
55ee51e
commit ea70ebe
Showing
4 changed files
with
523 additions
and
61 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 |
---|---|---|
@@ -1,23 +1,23 @@ | ||
From 768ff9ab40cc54e03895a46a4818d36dec150cac Mon Sep 17 00:00:00 2001 | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Paolo Sabatino <[email protected]> | ||
Date: Sun, 4 Apr 2021 10:29:29 +0000 | ||
Subject: [PATCH] Enable rockchip efuse for rk322x, rk3288 and rk3328 | ||
Subject: Enable rockchip efuse for rk322x, rk3288 and rk3328 | ||
|
||
--- | ||
arch/arm/dts/rk322x.dtsi | 14 +++ | ||
arch/arm/dts/rk322x.dtsi | 14 + | ||
arch/arm/dts/rk3288.dtsi | 3 +- | ||
configs/evb-rk3229_defconfig | 3 + | ||
configs/evb-rk3328_defconfig | 3 + | ||
configs/miqi-rk3288_defconfig | 2 + | ||
configs/rock64-rk3328_defconfig | 2 + | ||
configs/tinker-rk3288_defconfig | 1 + | ||
configs/tinker-s-rk3288_defconfig | 1 + | ||
drivers/misc/rockchip-efuse.c | 142 ++++++++++++++++++++++++- | ||
drivers/misc/rockchip-efuse.c | 142 +++++++++- | ||
include/dt-bindings/clock/rk3228-cru.h | 4 + | ||
10 files changed, 169 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/arch/arm/dts/rk322x.dtsi b/arch/arm/dts/rk322x.dtsi | ||
index 4a8be5dabb..255e3a7a28 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/arch/arm/dts/rk322x.dtsi | ||
+++ b/arch/arm/dts/rk322x.dtsi | ||
@@ -212,6 +212,20 @@ | ||
|
@@ -42,7 +42,7 @@ index 4a8be5dabb..255e3a7a28 100644 | |
compatible = "rockchip,rk3228-i2c"; | ||
reg = <0x11050000 0x1000>; | ||
diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi | ||
index 22bb06cec5..381391360c 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/arch/arm/dts/rk3288.dtsi | ||
+++ b/arch/arm/dts/rk3288.dtsi | ||
@@ -919,8 +919,7 @@ | ||
|
@@ -56,10 +56,10 @@ index 22bb06cec5..381391360c 100644 | |
|
||
gic: interrupt-controller@ffc01000 { | ||
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig | ||
index e708ed4909..e3ba0651fd 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/configs/evb-rk3229_defconfig | ||
+++ b/configs/evb-rk3229_defconfig | ||
@@ -49,6 +49,8 @@ CONFIG_FASTBOOT_BUF_SIZE=0x04000000 | ||
@@ -54,6 +54,8 @@ CONFIG_FASTBOOT_BUF_SIZE=0x04000000 | ||
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
CONFIG_ROCKCHIP_GPIO=y | ||
CONFIG_SYS_I2C_ROCKCHIP=y | ||
|
@@ -68,24 +68,24 @@ index e708ed4909..e3ba0651fd 100644 | |
CONFIG_MMC_DW=y | ||
CONFIG_MMC_DW_ROCKCHIP=y | ||
CONFIG_MTD=y | ||
@@ -68,3 +70,4 @@ CONFIG_USB_GADGET=y | ||
@@ -73,3 +75,4 @@ CONFIG_USB_GADGET=y | ||
CONFIG_USB_GADGET_DWC2_OTG=y | ||
CONFIG_TPL_TINY_MEMSET=y | ||
CONFIG_ERRNO_STR=y | ||
+CONFIG_MISC_INIT_R=y | ||
diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig | ||
index 9cbfeb0279..f0acfd8abd 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/configs/evb-rk3328_defconfig | ||
+++ b/configs/evb-rk3328_defconfig | ||
@@ -20,6 +20,7 @@ CONFIG_FIT=y | ||
@@ -22,6 +22,7 @@ CONFIG_FIT=y | ||
CONFIG_FIT_VERBOSE=y | ||
CONFIG_SPL_LOAD_FIT=y | ||
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-evb.dtb" | ||
+CONFIG_MISC_INIT_R=y | ||
# CONFIG_DISPLAY_CPUINFO is not set | ||
CONFIG_DISPLAY_BOARDINFO_LATE=y | ||
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set | ||
@@ -56,6 +57,8 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 | ||
@@ -58,6 +59,8 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 | ||
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
CONFIG_ROCKCHIP_GPIO=y | ||
CONFIG_SYS_I2C_ROCKCHIP=y | ||
|
@@ -95,10 +95,10 @@ index 9cbfeb0279..f0acfd8abd 100644 | |
CONFIG_MMC_DW_ROCKCHIP=y | ||
CONFIG_SF_DEFAULT_SPEED=20000000 | ||
diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig | ||
index 234ced5ab0..3d42e93866 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/configs/miqi-rk3288_defconfig | ||
+++ b/configs/miqi-rk3288_defconfig | ||
@@ -49,6 +49,8 @@ CONFIG_SPL_CLK=y | ||
@@ -52,6 +52,8 @@ CONFIG_SPL_CLK=y | ||
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
CONFIG_ROCKCHIP_GPIO=y | ||
CONFIG_SYS_I2C_ROCKCHIP=y | ||
|
@@ -108,10 +108,10 @@ index 234ced5ab0..3d42e93866 100644 | |
CONFIG_MMC_DW_ROCKCHIP=y | ||
CONFIG_MTD=y | ||
diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig | ||
index cb79cea821..dacb57165e 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/configs/rock64-rk3328_defconfig | ||
+++ b/configs/rock64-rk3328_defconfig | ||
@@ -57,6 +57,8 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 | ||
@@ -59,6 +59,8 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 | ||
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
CONFIG_ROCKCHIP_GPIO=y | ||
CONFIG_SYS_I2C_ROCKCHIP=y | ||
|
@@ -121,10 +121,10 @@ index cb79cea821..dacb57165e 100644 | |
CONFIG_MMC_DW_ROCKCHIP=y | ||
CONFIG_SF_DEFAULT_SPEED=20000000 | ||
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig | ||
index 8686a66d13..b7dc845451 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/configs/tinker-rk3288_defconfig | ||
+++ b/configs/tinker-rk3288_defconfig | ||
@@ -52,6 +52,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
@@ -56,6 +56,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
CONFIG_ROCKCHIP_GPIO=y | ||
CONFIG_SYS_I2C_ROCKCHIP=y | ||
CONFIG_MISC=y | ||
|
@@ -133,10 +133,10 @@ index 8686a66d13..b7dc845451 100644 | |
CONFIG_MMC_DW=y | ||
CONFIG_MMC_DW_ROCKCHIP=y | ||
diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig | ||
index 22714833cc..19aa314164 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/configs/tinker-s-rk3288_defconfig | ||
+++ b/configs/tinker-s-rk3288_defconfig | ||
@@ -53,6 +53,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
@@ -57,6 +57,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y | ||
CONFIG_ROCKCHIP_GPIO=y | ||
CONFIG_SYS_I2C_ROCKCHIP=y | ||
CONFIG_MISC=y | ||
|
@@ -145,7 +145,7 @@ index 22714833cc..19aa314164 100644 | |
CONFIG_MMC_DW=y | ||
CONFIG_MMC_DW_ROCKCHIP=y | ||
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c | ||
index 083ee65e0a..0fcbcfc69a 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/drivers/misc/rockchip-efuse.c | ||
+++ b/drivers/misc/rockchip-efuse.c | ||
@@ -14,6 +14,7 @@ | ||
|
@@ -343,7 +343,7 @@ index 083ee65e0a..0fcbcfc69a 100644 | |
}; | ||
|
||
diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h | ||
index 1217d5239f..13b2f4e4a4 100644 | ||
index 111111111111..222222222222 100644 | ||
--- a/include/dt-bindings/clock/rk3228-cru.h | ||
+++ b/include/dt-bindings/clock/rk3228-cru.h | ||
@@ -67,6 +67,10 @@ | ||
|
@@ -358,5 +358,5 @@ index 1217d5239f..13b2f4e4a4 100644 | |
#define PCLK_I2C0 332 | ||
#define PCLK_I2C1 333 | ||
-- | ||
2.25.1 | ||
Armbian | ||
|
Oops, something went wrong.