mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
[ Pinebook ] Update atf and u-boot patches. Affects also Teres and Olinuxino
This commit is contained in:
@@ -14,4 +14,4 @@ CLI_TARGET=""
|
|||||||
DESKTOP_TARGET="xenial:default"
|
DESKTOP_TARGET="xenial:default"
|
||||||
#
|
#
|
||||||
CLI_BETA_TARGET=""
|
CLI_BETA_TARGET=""
|
||||||
DESKTOP_BETA_TARGET=""
|
DESKTOP_BETA_TARGET=""
|
||||||
|
|||||||
@@ -49,12 +49,13 @@ case $BRANCH in
|
|||||||
BOOTENV_FILE='sun50iw1-next.txt'
|
BOOTENV_FILE='sun50iw1-next.txt'
|
||||||
BOOTSOURCE='https://github.com/anarsoul/u-boot-pine64'
|
BOOTSOURCE='https://github.com/anarsoul/u-boot-pine64'
|
||||||
BOOTDIR=$MAINLINE_UBOOT_DIR
|
BOOTDIR=$MAINLINE_UBOOT_DIR
|
||||||
BOOTBRANCH='branch:pinebook-wip-20180617'
|
BOOTBRANCH='branch:pinebook-wip-20181104'
|
||||||
BOOTPATCHDIR='u-boot-sun50iw2'
|
BOOTPATCHDIR='u-boot-sun50iw2'
|
||||||
UBOOT_USE_GCC='> 7.0'
|
UBOOT_USE_GCC='> 7.0'
|
||||||
UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb'
|
UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb'
|
||||||
BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
|
BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
|
||||||
GOVERNOR=ondemand
|
GOVERNOR=ondemand
|
||||||
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|||||||
@@ -23,12 +23,12 @@ diff --git a/configs/a64-olinuxino_defconfig b/configs/a64-olinuxino_defconfig
|
|||||||
index b32df99..4497dbe 100644
|
index b32df99..4497dbe 100644
|
||||||
--- a/configs/a64-olinuxino_defconfig
|
--- a/configs/a64-olinuxino_defconfig
|
||||||
+++ b/configs/a64-olinuxino_defconfig
|
+++ b/configs/a64-olinuxino_defconfig
|
||||||
@@ -9,6 +9,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-olinuxino"
|
@@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1
|
||||||
# CONFIG_CMD_FLASH is not set
|
# CONFIG_CMD_FLASH is not set
|
||||||
# CONFIG_SPL_DOS_PARTITION is not set
|
# CONFIG_SPL_DOS_PARTITION is not set
|
||||||
# CONFIG_SPL_EFI_PARTITION is not set
|
# CONFIG_SPL_EFI_PARTITION is not set
|
||||||
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||||
+CONFIG_SPL_SPI_SUNXI=y
|
+CONFIG_SPL_SPI_SUNXI=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-olinuxino"
|
||||||
CONFIG_SUN8I_EMAC=y
|
CONFIG_SUN8I_EMAC=y
|
||||||
CONFIG_USB_EHCI_HCD=y
|
CONFIG_USB_EHCI_HCD=y
|
||||||
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|
|
||||||
@@ -174,13 +174,13 @@ index 0000000000..da33b4131d
|
|||||||
+CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y
|
+CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y
|
||||||
--- a/arch/arm/dts/Makefile
|
--- a/arch/arm/dts/Makefile
|
||||||
+++ b/arch/arm/dts/Makefile
|
+++ b/arch/arm/dts/Makefile
|
||||||
@@ -392,7 +392,8 @@ dtb-$(CONFIG_MACH_SUN50I) += \
|
@@ -406,7 +406,8 @@ dtb-$(CONFIG_MACH_SUN50I) += \
|
||||||
sun50i-a64-orangepi-win.dtb \
|
|
||||||
sun50i-a64-pine64-plus.dtb \
|
sun50i-a64-pine64-plus.dtb \
|
||||||
sun50i-a64-pine64.dtb \
|
sun50i-a64-pine64.dtb \
|
||||||
- sun50i-a64-pinebook.dtb
|
sun50i-a64-pinebook.dtb \
|
||||||
+ sun50i-a64-pinebook.dtb \
|
- sun50i-a64-sopine-baseboard.dtb
|
||||||
+ sun50i-a64-teres-i.dtb
|
+ sun50i-a64-sopine-baseboard.dtb \
|
||||||
|
+ sun50i-a64-teres-i.dtb
|
||||||
dtb-$(CONFIG_MACH_SUN9I) += \
|
dtb-$(CONFIG_MACH_SUN9I) += \
|
||||||
sun9i-a80-optimus.dtb \
|
sun9i-a80-optimus.dtb \
|
||||||
sun9i-a80-cubieboard4.dtb \
|
sun9i-a80-cubieboard4.dtb \
|
||||||
|
|||||||
@@ -2,15 +2,15 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|||||||
index 53eae8953e..1e931a0eb0 100644
|
index 53eae8953e..1e931a0eb0 100644
|
||||||
--- a/arch/arm/Kconfig
|
--- a/arch/arm/Kconfig
|
||||||
+++ b/arch/arm/Kconfig
|
+++ b/arch/arm/Kconfig
|
||||||
@@ -696,6 +696,8 @@ config ARCH_SUNXI
|
@@ -843,6 +843,8 @@ config ARCH_SUNXI
|
||||||
select USB_STORAGE if DISTRO_DEFAULTS
|
|
||||||
select USB_KEYBOARD if DISTRO_DEFAULTS
|
select USB_KEYBOARD if DISTRO_DEFAULTS
|
||||||
|
select USB_STORAGE if DISTRO_DEFAULTS
|
||||||
select USE_TINY_PRINTF
|
select USE_TINY_PRINTF
|
||||||
+ imply AUTOBOOT_KEYED
|
+ imply AUTOBOOT_KEYED
|
||||||
+ imply AUTOBOOT_KEYED_CTRLC
|
+ imply AUTOBOOT_KEYED_CTRLC
|
||||||
|
imply CMD_DM
|
||||||
imply CMD_GPT
|
imply CMD_GPT
|
||||||
imply FAT_WRITE
|
imply CMD_UBI if NAND
|
||||||
imply PRE_CONSOLE_BUFFER
|
|
||||||
diff --git a/cmd/Kconfig b/cmd/Kconfig
|
diff --git a/cmd/Kconfig b/cmd/Kconfig
|
||||||
index d6d130edfa..46ed3a9d76 100644
|
index d6d130edfa..46ed3a9d76 100644
|
||||||
--- a/cmd/Kconfig
|
--- a/cmd/Kconfig
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi
|
|
||||||
index 76b9311..3655f5e 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64.dtsi
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64.dtsi
|
|
||||||
@@ -295,7 +295,7 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
mmc2_pins: mmc2-pins {
|
|
||||||
- pins = "PC1", "PC5", "PC6", "PC8", "PC9",
|
|
||||||
+ pins = "PC5", "PC6", "PC8", "PC9",
|
|
||||||
"PC10","PC11", "PC12", "PC13",
|
|
||||||
"PC14", "PC15", "PC16";
|
|
||||||
function = "mmc2";
|
|
||||||
Reference in New Issue
Block a user