aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/linux-vanilla/APKBUILD15
-rw-r--r--main/linux-vanilla/config-vanilla.aarch6422
2 files changed, 17 insertions, 20 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 9d05769147..59802815a2 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -95,18 +95,8 @@ package() {
local _install
case "$CARCH" in
- arm* | aarch64*)
- local _dtbdir="$pkgdir"/usr/lib/linux-${_abi_release}
- mkdir -p "$_dtbdir"
- for i in arch/arm/boot/dts/*.dtb ; do
- install -m644 "$i" "$_dtbdir"
- done
-
- _install=zinstall
- ;;
- *)
- _install=install
- ;;
+ aarch64*|arm*) _install="zinstall dtbs_install" ;;
+ *) _install="install" ;;
esac
make -j1 modules_install firmware_install $_install \
@@ -114,6 +104,7 @@ package() {
KCFLAGS="-fno-pie" \
INSTALL_MOD_PATH="$pkgdir" \
INSTALL_PATH="$pkgdir"/boot \
+ INSTALL_DTBS_PATH="$pkgdir"/usr/lib/linux-${_abi_release} \
|| return 1
rm -f "$pkgdir"/lib/modules/${_abi_release}/build \
diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64
index 5d96e756c4..0127067b30 100644
--- a/main/linux-vanilla/config-vanilla.aarch64
+++ b/main/linux-vanilla/config-vanilla.aarch64
@@ -398,7 +398,6 @@ CONFIG_CAVIUM_ERRATUM_23154=y
# CONFIG_ARM64_4K_PAGES is not set
# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_64K_PAGES=y
-# CONFIG_ARM64_VA_BITS_39 is not set
CONFIG_ARM64_VA_BITS_42=y
# CONFIG_ARM64_VA_BITS_48 is not set
CONFIG_ARM64_VA_BITS=42
@@ -2975,12 +2974,15 @@ CONFIG_SERIAL_8250_MID=m
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_AMBA_PL010=m
-CONFIG_SERIAL_AMBA_PL011=m
-# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
-CONFIG_SERIAL_SAMSUNG=m
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
+CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIAL_SAMSUNG_UARTS=4
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_MAX3100=m
# CONFIG_SERIAL_MAX310X is not set
# CONFIG_SERIAL_UARTLITE is not set
@@ -3351,7 +3353,7 @@ CONFIG_POWER_RESET=y
# CONFIG_POWER_RESET_LTC2952 is not set
# CONFIG_POWER_RESET_RESTART is not set
CONFIG_POWER_RESET_VEXPRESS=y
-# CONFIG_POWER_RESET_XGENE is not set
+CONFIG_POWER_RESET_XGENE=y
# CONFIG_POWER_RESET_SYSCON is not set
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_POWER_AVS is not set
@@ -5171,7 +5173,11 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_ISER=m
# CONFIG_INFINIBAND_ISERT is not set
CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_XGENE=m
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
@@ -5580,7 +5586,7 @@ CONFIG_PHY_XGENE=m
# Performance monitor support
#
CONFIG_ARM_PMU=y
-# CONFIG_RAS is not set
+CONFIG_RAS=y
CONFIG_THUNDERBOLT=m
#