armbian/build
0
0
Fork 0
mirror of https://github.com/armbian/build.git synced 2026-01-06 09:58:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge safe changes from development to master, part 1

Browse Source
This commit is contained in:
zador-blood-stained
2018-04-29 15:47:40 +03:00
parent 8028936cc7
commit bedc19439f
7 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/boards/bananapim2ultra.csc
View File

@@ -1,5 +1,5 @@
# R40 quad core 2Gb SoC Wifi eMMC
BOARD_NAME="Banana Pi M2 Ultra"
BOARD_NAME="Banana Pi M2U"
BOARDFAMILY="sun8i"
BOOTCONFIG="Bananapi_M2_Ultra_defconfig"
MODULES=""

2
config/boards/bananapipro.conf
View File

@@ -9,7 +9,7 @@ KERNEL_TARGET="default,next,dev"
CLI_TARGET="stretch,xenial:next"
DESKTOP_TARGET="xenial:default,next"
#
CLI_BETA_TARGET=""
CLI_BETA_TARGET="xenial:dev"
DESKTOP_BETA_TARGET=""
#
RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_stretch_next:100"

4
config/boards/odroidc2.conf
View File

@@ -12,8 +12,8 @@ KERNEL_TARGET="default,next,dev"
CLI_TARGET="jessie,xenial:default"
DESKTOP_TARGET="xenial:default"
CLI_BETA_TARGET="stretch:next"
DESKTOP_BETA_TARGET=""
CLI_BETA_TARGET="jessie,xenial,stretch:next"
DESKTOP_BETA_TARGET="jessie,xenial,stretch:next"
#
RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_default:90"
#

4
config/boards/orangepiplus2e.conf
View File

@@ -12,8 +12,8 @@ KERNEL_TARGET="default,next,dev"
CLI_TARGET="stretch,xenial:next"
DESKTOP_TARGET="xenial:default"
#
CLI_BETA_TARGET=""
DESKTOP_BETA_TARGET=""
CLI_BETA_TARGET="jessie,xenial,stretch:next"
DESKTOP_BETA_TARGET="jessie,xenial,stretch:next"
#
RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_stretch_next:75"
#

1
config/bootscripts/boot-odroid-xu4-default.ini
View File

@@ -245,6 +245,7 @@ ext4load mmc 0:1 0x42000000 /boot/uInitrd || fatload mmc 0:1 0x42000000 uInitrd
if test "${board_name}" = "xu4"; then setenv fdtfile "exynos5422-odroidxu4.dtb"; fi
if test "${board_name}" = "xu3"; then setenv fdtfile "exynos5422-odroidxu3.dtb"; fi
if test "${board_name}" = "xu3l"; then setenv fdtfile "exynos5422-odroidxu3-lite.dtb"; fi
if test "${board_name}" = "hc1"; then setenv fdtfile "exynos5422-odroidhc1.dtb"; fi
# legacy shares a single DT for all boards
if ext4load mmc 0:1 0x00000000 "/boot/.next" || fatload mmc 0:1 0x00000000 ".next" || ext4load mmc 0:1 0x00000000 ".next"; then echo "Found mainline kernel configuration"; else setenv fdtfile "exynos5422-odroidxu3.dtb"; fi

8
config/sources/mvebu.conf
View File

@@ -37,10 +37,10 @@ case $BRANCH in
OVERLAY_PREFIX='armada-388'
KERNELSOURCE='git://git.armlinux.org.uk/~rmk/linux-arm.git'
KERNELBRANCH='branch:clearfog'
KERNELDIR='linux-mvebu-dev'
# LINUXCONFIG='linux-mvebu-next'
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH='branch:linux-4.14.y'
KERNELDIR=$MAINLINE_KERNEL_DIR
LINUXCONFIG='linux-mvebu-next'
KERNEL_USE_GCC='> 7.0'
;;

4
config/templates/customize-image.sh.template
View File

@@ -29,6 +29,10 @@ Main() {
# your code here
# InstallOpenMediaVault # uncomment to get an OMV 4 image
;;
bionic)
# your code here
# InstallOpenMediaVault # uncomment to get an OMV 4 image
;;
esac
} # Main