GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-06-24 23:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging config files from development

Browse source
This commit is contained in:
Igor Pecovnik 2018-05-27 13:08:19 +02:00
parent 025a164e8f
commit f6d4d89b08
11 changed files with 7357 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

15
config/boards/nanopik1plus.csc Normal file
View file

@ -0,0 +1,15 @@
# H5 quad core 2GB RAM Wifi GBE eMMC
BOARD_NAME="Nanopi K1 Plus"
BOARDFAMILY="sun50iw2"
BOOTCONFIG="orangepi_pc2_defconfig"
MODULES=""
MODULES_NEXT=""
CPUMIN="408000"
CPUMAX="1296000"
#
KERNEL_TARGET="next,dev"
CLI_TARGET="stretch,xenial:next"
DESKTOP_TARGET="stretch,xenial:next"
#
CLI_BETA_TARGET=""
DESKTOP_BETA_TARGET=""

10
config/boards/roc-rk3328-cc.csc
View file

@ -6,16 +6,16 @@ BOOTCONFIG="roc-rk3328-cc_defconfig"
MODULES=""
MODULES_NEXT=""
#
KERNEL_TARGET="default"
KERNEL_TARGET="default,dev"
CLI_TARGET=""
DESKTOP_TARGET=""
CLI_BETA_TARGET="xenial:default"
DESKTOP_BETA_TARGET=""
CLI_BETA_TARGET="xenial:default,stretch:dev"
DESKTOP_BETA_TARGET="stretch:default"
#
RECOMMENDED="Ubuntu_xenial_default_nightly:50"
RECOMMENDED="Debian_stretch_default_desktop_nightly:50"
#
CHIP="https://en.wikipedia.org/wiki/Rockchip#RK33xx_series"
HARDWARE="http://www.t-firefly.com/doc/product/info/id/245.html"
FORUMS="http://dev.t-firefly.com/index.html"
FORUMS="https://forum.armbian.com/index.php?/forum/21-rockchip"
BUY="http://store.t-firefly.com/goods.php?id=66"

2
config/bootenv/rk3328-default.txt
View file

@ -1,4 +1,2 @@
verbosity=1
console=both
ethaddr=02:38:a0:82:2d:c0
eth1addr=02:38:a0:82:2e:c1

27
config/bootscripts/boot-meson64-lepotato.cmd
View file

@ -1,27 +1,18 @@
if test -e mmc 0:1 boot/.next;
then setenv condev "console=ttyAML0,115200n8";
else setenv condev "console=ttyS0,115200n8 earlyprintk=aml-uart,0xc81004c0"; fi
setenv condev "console=ttyAML0,115200n8";
if test -e mmc 0:1 boot/.next;
then setenv rootdev "/dev/mmcblk1p1";
else setenv rootdev "/dev/mmcblk0p1"; fi
setenv rootdev "/dev/mmcblk1p1";
if test -e mmc 0:1 boot/.next;
then setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=ext4 ${condev} no_console_suspend consoleblank=0 fsck.repair=yes loglevel=5 net.ifnames=0";
else setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=ext4 ${condev} no_console_suspend consoleblank=0 cvbsmode=576cvbs hdmimode=1080p60hz cvbsdrv=0 m_bpp=24 loglevel=5 net.ifnames=0"; fi
setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=ext4 ${condev} no_console_suspend consoleblank=0 fsck.repair=yes loglevel=5 net.ifnames=0";
${bloader} ${initrd_start} /boot/uInitrd
if test -e mmc 0:1 boot/.next;
then ${bloader} ${dtb_mem_addr} boot/dtb/amlogic/meson-gxl-s905x-libretech-cc.dtb;
else ${bloader} ${dtb_mem_addr} boot/dtb/meson-gxl-s905x-libretech-cc.dtb; fi
${bloader} ${dtb_mem_addr} boot/dtb/amlogic/meson-gxl-s905x-libretech-cc.dtb;
fdt addr ${dtb_mem_addr}
if test -e mmc 0:1 boot/.next;
then ${bloader} 0x01080000 boot/uImage;
else ${bloader} ${loadaddr} /boot/zImage; fi
${bloader} 0x01080000 boot/uImage;
bootm 0x01080000 ${initrd_start} ${dtb_mem_addr};
if test -e mmc 0:1 boot/.next;
then bootm 0x01080000 ${initrd_start} ${dtb_mem_addr};
else booti ${loadaddr} ${initrd_start} ${dtb_mem_addr}; fi

17
config/bootscripts/boot-meson64-nanopik2-s905.cmd Normal file
View file

@ -0,0 +1,17 @@
setenv condev "console=ttyAML0,115200n8";
setenv rootdev "/dev/mmcblk0p1";
setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=ext4 ${condev} no_console_suspend consoleblank=0 fsck.repair=yes loglevel=5 net.ifnames=0";
${bloader} ${initrd_start} /boot/uInitrd
${bloader} ${dtb_mem_addr} boot/dtb/amlogic/meson-gxbb-nanopi-k2.dtb;
fdt addr ${dtb_mem_addr}
${bloader} 0x01080000 boot/uImage;
bootm 0x01080000 ${initrd_start} ${dtb_mem_addr};

4
config/bootscripts/boot-rk3328.cmd
View file

@ -22,14 +22,14 @@ fi
if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttyFIQ0,1500000"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttyS2,1500000"; fi
# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} panic=10 consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi
if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi
load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image

7296
config/kernel/linux-odroidc1-dev.config Normal file
View file

File diff suppressed because it is too large Load diff

2
config/kernel/linux-rda8810-default.config
View file

@ -891,7 +891,7 @@ CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_MESH=y
# CONFIG_MAC80211_LEDS is not set
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_MESSAGE_TRACING is not set

11
config/sources/odroidc1.conf
View file

@ -19,11 +19,12 @@ case $BRANCH in
CAN_BUILD_STRETCH=no
;;
next)
KERNELSOURCE='https://github.com/tobetter/linux'
KERNELBRANCH='branch:odroidxu4-v4.2'
KERNELDIR='linux-odroidxu-next'
KERNEL_USE_GCC='> 6.0'
dev)
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH='branch:master'
KERNELDIR=$MAINLINE_KERNEL_DIR
KERNEL_USE_GCC='> 7.0'
;;
esac

4
config/sources/rockchip.conf
View file

@ -61,8 +61,8 @@ family_tweaks()
{
if [[ $BOARD == tinkerboard ]]; then
echo "fdt_file=rk3288-miniarm.dtb" >> $SDCARD/boot/armbianEnv.txt
echo "console=ttyS3,115200n8" >> $SDCARD/boot/armbianEnv.txt
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable tinker-bluetooth.service >/dev/null 2>&1"
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable tinker-bluetooth-restart.service >/dev/null 2>&1"
chroot $SDCARD /bin/bash -c "sed -i -e '/#load-module module-alsa-sink/r /usr/local/bin/pulseaudio.txt' /etc/pulse/default.pa >/dev/null 2>&1"
chroot $SDCARD /bin/bash -c "rm /usr/local/bin/pulseaudio.txt"
fi
@ -82,8 +82,8 @@ family_tweaks_bsp()
install -m 755 $SRC/packages/bsp/rockchip/hdmi-hotplug $destination/usr/local/bin
# Bluetooth
install -m 755 $SRC/packages/bsp/rockchip/rtk_hciattach $destination/usr/bin
install -m 755 $SRC/packages/bsp/rockchip/start_bt.sh $destination/usr/local/bin
cp $SRC/packages/bsp/rockchip/tinker-bluetooth.service $destination/lib/systemd/system/
cp $SRC/packages/bsp/rockchip/tinker-bluetooth-restart.service $destination/lib/systemd/system/
# Sound
cp $SRC/packages/bsp/rockchip/asound.conf $destination/etc/
}

8
config/templates/customize-image.sh.template
View file

@ -31,7 +31,6 @@ Main() {
;;
bionic)
# your code here
# InstallOpenMediaVault # uncomment to get an OMV 4 image
;;
esac
} # Main
@ -54,6 +53,8 @@ InstallOpenMediaVault() {
rm /root/.not_logged_in_yet
. /etc/default/cpufrequtils
export LANG=C LC_ALL="en_US.UTF-8"
export DEBIAN_FRONTEND=noninteractive
export APT_LISTCHANGES_FRONTEND=none
case ${RELEASE} in
jessie)
@ -66,7 +67,7 @@ InstallOpenMediaVault() {
;;
esac
#Add OMV source.list and Update System
# Add OMV source.list and Update System
cat > /etc/apt/sources.list.d/openmediavault.list <<- EOF
deb https://openmediavault.github.io/packages/ ${OMV_Name} main
## Uncomment the following line to add software from the proposed repository.
@ -86,6 +87,7 @@ InstallOpenMediaVault() {
apt-get update
apt-get --yes --force-yes --allow-unauthenticated install openmediavault-keyring
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7AA630A1EDEE7D73
apt-get update
# install debconf-utils, postfix and OMV
HOSTNAME="${BOARD}"
@ -100,7 +102,6 @@ InstallOpenMediaVault() {
-e "s/^127.0.0.1 localhost.*/127.0.0.1 ${HOSTNAME} localhost/" /etc/hosts
sed -i -e "s/^mydestination =.*/mydestination = ${HOSTNAME}, localhost.localdomain, localhost/" \
-e "s/^myhostname =.*/myhostname = ${HOSTNAME}/" /etc/postfix/main.cf
export DEBIAN_FRONTEND=noninteractive
apt-get --yes --force-yes --allow-unauthenticated --fix-missing --no-install-recommends \
-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install \
openmediavault
@ -208,4 +209,3 @@ InstallOpenMediaVault() {
} # InstallOpenMediaVault
Main "$@"