mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
uboot-sunxi: refresh patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
175538ffdb
commit
f142de5f44
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/arm/dts/Makefile
|
--- a/arch/arm/dts/Makefile
|
||||||
+++ b/arch/arm/dts/Makefile
|
+++ b/arch/arm/dts/Makefile
|
||||||
@@ -254,6 +254,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
|
@@ -261,6 +261,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
|
||||||
sun6i-a31-m9.dtb \
|
sun6i-a31-m9.dtb \
|
||||||
sun6i-a31-mele-a1000g-quad.dtb \
|
sun6i-a31-mele-a1000g-quad.dtb \
|
||||||
sun6i-a31-mixtile-loftq.dtb \
|
sun6i-a31-mixtile-loftq.dtb \
|
||||||
@ -360,7 +360,7 @@
|
|||||||
+CONFIG_SUNXI_SPI=y
|
+CONFIG_SUNXI_SPI=y
|
||||||
--- a/arch/arm/mach-sunxi/Kconfig
|
--- a/arch/arm/mach-sunxi/Kconfig
|
||||||
+++ b/arch/arm/mach-sunxi/Kconfig
|
+++ b/arch/arm/mach-sunxi/Kconfig
|
||||||
@@ -746,6 +746,14 @@ config VIDEO_LCD_PANEL_I2C_SCL
|
@@ -752,6 +752,14 @@ config VIDEO_LCD_PANEL_I2C_SCL
|
||||||
Set the SCL pin for the LCD i2c interface. This takes a string in the
|
Set the SCL pin for the LCD i2c interface. This takes a string in the
|
||||||
format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H.
|
format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H.
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ More specifically, the following settings are now used:
|
|||||||
|
|
||||||
--- a/arch/arm/mach-sunxi/clock_sun6i.c
|
--- a/arch/arm/mach-sunxi/clock_sun6i.c
|
||||||
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
|
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
|
||||||
@@ -107,11 +107,12 @@ void clock_set_pll1(unsigned int clk)
|
@@ -113,11 +113,12 @@ void clock_set_pll1(unsigned int clk)
|
||||||
struct sunxi_ccm_reg * const ccm =
|
struct sunxi_ccm_reg * const ccm =
|
||||||
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
||||||
const int p = 0;
|
const int p = 0;
|
||||||
|
@ -6,7 +6,7 @@ Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7)
|
|||||||
|
|
||||||
--- a/arch/arm/mach-sunxi/board.c
|
--- a/arch/arm/mach-sunxi/board.c
|
||||||
+++ b/arch/arm/mach-sunxi/board.c
|
+++ b/arch/arm/mach-sunxi/board.c
|
||||||
@@ -126,6 +126,10 @@ static int gpio_init(void)
|
@@ -124,6 +124,10 @@ static int gpio_init(void)
|
||||||
sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1);
|
sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1);
|
||||||
sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1);
|
sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1);
|
||||||
sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP);
|
sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP);
|
||||||
@ -19,7 +19,7 @@ Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7)
|
|||||||
sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2);
|
sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2);
|
||||||
--- a/include/configs/sunxi-common.h
|
--- a/include/configs/sunxi-common.h
|
||||||
+++ b/include/configs/sunxi-common.h
|
+++ b/include/configs/sunxi-common.h
|
||||||
@@ -259,6 +259,8 @@ extern int soft_i2c_gpio_scl;
|
@@ -256,6 +256,8 @@ extern int soft_i2c_gpio_scl;
|
||||||
#endif
|
#endif
|
||||||
#elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
|
#elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
|
||||||
#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200"
|
#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200"
|
||||||
|
@ -6,7 +6,7 @@ Subject: ARM: sunxi: Make CONS_INDEX configurable
|
|||||||
|
|
||||||
--- a/arch/arm/mach-sunxi/Kconfig
|
--- a/arch/arm/mach-sunxi/Kconfig
|
||||||
+++ b/arch/arm/mach-sunxi/Kconfig
|
+++ b/arch/arm/mach-sunxi/Kconfig
|
||||||
@@ -412,6 +412,14 @@ config SYS_BOARD
|
@@ -416,6 +416,14 @@ config SYS_BOARD
|
||||||
config SYS_SOC
|
config SYS_SOC
|
||||||
default "sunxi"
|
default "sunxi"
|
||||||
|
|
||||||
|
@ -12,9 +12,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
|
|
||||||
--- a/arch/arm/dts/Makefile
|
--- a/arch/arm/dts/Makefile
|
||||||
+++ b/arch/arm/dts/Makefile
|
+++ b/arch/arm/dts/Makefile
|
||||||
@@ -310,6 +310,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
|
@@ -318,6 +318,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
|
||||||
sun8i-a83t-cubietruck-plus.dtb \
|
sun8i-a83t-bananapi-m3.dtb \
|
||||||
sun8i-a83t-sinovoip-bpi-m3.dtb
|
sun8i-a83t-cubietruck-plus.dtb
|
||||||
dtb-$(CONFIG_MACH_SUN8I_H3) += \
|
dtb-$(CONFIG_MACH_SUN8I_H3) += \
|
||||||
+ sun8i-h2-plus-orangepi-r1.dtb \
|
+ sun8i-h2-plus-orangepi-r1.dtb \
|
||||||
sun8i-h2-plus-orangepi-zero.dtb \
|
sun8i-h2-plus-orangepi-zero.dtb \
|
||||||
|
@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
|
|
||||||
--- a/board/sunxi/MAINTAINERS
|
--- a/board/sunxi/MAINTAINERS
|
||||||
+++ b/board/sunxi/MAINTAINERS
|
+++ b/board/sunxi/MAINTAINERS
|
||||||
@@ -302,6 +302,11 @@ M: Jagan Teki <jagan@amarulasolutions.co
|
@@ -326,6 +326,11 @@ M: Jagan Teki <jagan@amarulasolutions.co
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: configs/orangepi_prime_defconfig
|
F: configs/orangepi_prime_defconfig
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user