enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from igorpecovnik/master

Browse Source 
update master 20160716 #1
This commit is contained in:
Guillaume Romagny 2016-07-16 16:45:06 +02:00 committed by GitHub
commit 0b35578b11
8 changed files with 175 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu
FROM ubuntu:16.04
RUN apt-get update
RUN apt-get install -y git build-essential binutils
WORKDIR /root

2
Vagrantfile vendored
View File

@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
config.vm.box = "ubuntu/trusty64"
config.vm.box = "ubuntu/xenial64"
# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs

24
general.sh
View File

@ -337,10 +337,6 @@ prepare_host() {
nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-armel-cross\
libc6-dev-arm64-cross curl pdftk"
# warning: apt-cacher-ng will fail if installed and used both on host and in container/chroot environment with shared network
# set NO_APT_CACHER=yes to prevent installation errors in such case
if [[ $NO_APT_CACHER != yes ]]; then hostdeps="$hostdeps apt-cacher-ng"; fi
local codename=$(lsb_release -sc)
display_alert "Build host OS release" "${codename:-(unknown)}" "info"
if [[ -z $codename || "trusty wily xenial" != *"$codename"* ]]; then
@ -355,7 +351,25 @@ prepare_host() {
apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460
fi
if [[ $codename == xenial ]]; then hostdeps="$hostdeps systemd-container"; fi
if [[ $codename == xenial ]]; then
hostdeps="$hostdeps systemd-container udev"
if systemd-detect-virt -q; then
display_alert "Running in container" "$(systemd-detect-virt)" "info"
# disable apt-cacher unless NO_APT_CACHER=no is not specified explicitly
if [[ $NO_APT_CACHER != no ]]; then
display_alert "apt-cacher is disabled, set NO_APT_CACHER=no to override" "" "wrn"
NO_APT_CACHER=yes
fi
# create device nodes for loop devices
for i in {0..6}; do
mknod -m0660 /dev/loop$i b 7 $i
done
fi
fi
# warning: apt-cacher-ng will fail if installed and used both on host and in container/chroot environment with shared network
# set NO_APT_CACHER=yes to prevent installation errors in such case
if [[ $NO_APT_CACHER != yes ]]; then hostdeps="$hostdeps apt-cacher-ng"; fi
# Deboostrap in trusty breaks due too old debootstrap. We are installing Xenial package
local debootstrap_version=$(dpkg-query -W -f='${Version}\n' debootstrap | cut -f1 -d'+')

28
patch/kernel/sun4i-default/cedar-remove-insecure-code.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/drivers/media/video/sunxi/sunxi_cedar.c b/drivers/media/video/sunxi/sunxi_cedar.c
index f30d086..3c6969e 100644
--- a/drivers/media/video/sunxi/sunxi_cedar.c
+++ b/drivers/media/video/sunxi/sunxi_cedar.c
@@ -765,23 +765,6 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
cedar_devp->ref_count = (int)arg;
break;
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- return -EFAULT;
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- return -EFAULT;
- writel(reg_para.value, reg_para.addr);
- break;
- }
-
default:
break;
}

28
patch/kernel/sun5i-default/cedar-remove-insecure-code.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/drivers/media/video/sunxi/sunxi_cedar.c b/drivers/media/video/sunxi/sunxi_cedar.c
index f30d086..3c6969e 100644
--- a/drivers/media/video/sunxi/sunxi_cedar.c
+++ b/drivers/media/video/sunxi/sunxi_cedar.c
@@ -765,23 +765,6 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
cedar_devp->ref_count = (int)arg;
break;
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- return -EFAULT;
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- return -EFAULT;
- writel(reg_para.value, reg_para.addr);
- break;
- }
-
default:
break;
}

28
patch/kernel/sun7i-default/cedar-remove-insecure-code.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/drivers/media/video/sunxi/sunxi_cedar.c b/drivers/media/video/sunxi/sunxi_cedar.c
index f30d086..3c6969e 100644
--- a/drivers/media/video/sunxi/sunxi_cedar.c
+++ b/drivers/media/video/sunxi/sunxi_cedar.c
@@ -765,23 +765,6 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
cedar_devp->ref_count = (int)arg;
break;
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- return -EFAULT;
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- return -EFAULT;
- writel(reg_para.value, reg_para.addr);
- break;
- }
-
default:
break;
}

27
patch/kernel/sun8i-default/0001-Fix-ump-build.patch Normal file
View File

@ -0,0 +1,27 @@
From ab2ccc6f757c7c49f84a719584b4dde5da431394 Mon Sep 17 00:00:00 2001
From: Andreas Baierl <ichgeh@imkreisrum.de>
Date: Tue, 8 Mar 2016 11:07:58 -0500
Subject: [PATCH] Fix ump build
---
arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h b/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h
index afa1202..02c7429 100755
--- a/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h
+++ b/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h
@@ -18,6 +18,10 @@
#define __MEMORY_SUN8I_W5P1_H
#define PLAT_PHYS_OFFSET UL(0x40000000)
+#define __phys_to_bus(x) ((u32)(x) < PLAT_PHYS_OFFSET ? (x) : \
+ (x) - PLAT_PHYS_OFFSET)
+#define __bus_to_phys(x) ((x) + PLAT_PHYS_OFFSET)
+
#ifdef CONFIG_EVB_PLATFORM
#define PLAT_MEM_SIZE SZ_2G
#else
--
2.7.0

43
patch/kernel/sun8i-default/cedar-remove-insecure-code.patch Normal file
View File

@ -0,0 +1,43 @@
From 6964d467510849e3e262518cb87bff7ef92e01f5 Mon Sep 17 00:00:00 2001
From: yangcaoyuan <yangcaoyuan@allwinnertech.com>
Date: Mon, 11 Jul 2016 10:23:00 +0800
Subject: [PATCH] driver:cedar-ve delete non_secure code
Change-Id: I6ca0037ea3decd13bb4ab854081f6ae4c576bd47
---
drivers/media/cedar-ve/cedar_ve.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/drivers/media/cedar-ve/cedar_ve.c b/drivers/media/cedar-ve/cedar_ve.c
index 0c1be78..a2f4bec 100755
--- a/drivers/media/cedar-ve/cedar_ve.c
+++ b/drivers/media/cedar-ve/cedar_ve.c
@@ -744,28 +744,7 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case IOCTL_GET_IC_VER:
{
return 0;
- }
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- writel(reg_para.value, reg_para.addr);
- break;
}
- break;
case IOCTL_SET_REFCOUNT:
cedar_devp->ref_count = (int)arg;
break;