Skip to content
Snippets Groups Projects
Verified Commit e21afdd6 authored by Karel Koci's avatar Karel Koci :metal:
Browse files

Merge branch 'master' into v4.0

parents e34faba8 2dbcdc2a
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 121 additions and 147 deletions
configs/mox/base
+ 1
− 0
View file @ e21afdd6
CONFIG_PACKAGE_mox-support=y
CONFIG_PACKAGE_turris-netboot-data=y
generate_medkit
+ 3
− 3
View file @ e21afdd6
......@@ -19,7 +19,7 @@ set -e
export BOARD=
export BRANCH="hbs"
export UPDATER_BRANCH=
export L10N=en,cs
export L10N=cs,de
# TODO fill in default lists when we have them selected
export LISTS=
export UPDATER_SCRIPT=
......@@ -57,7 +57,7 @@ while [ $# -gt 0 ]; do
echo " --localization, -l LOCALIZATION,.."
echo " After this argument a list of language codes to be added to"
echo " medkit should be specified. Language codes should be"
echo " separated by comma. In default en,cs is used."
echo " separated by comma. In default cs,de is used."
echo " --lists, -p PKGLIST,.."
echo " What lists should be added to medkit. In default no"
echo " additional lists will be added. Multiple lists can be"
......@@ -174,7 +174,7 @@ mkdir -p root/usr/share/updater
m4args=()
[ -z "\$UPDATER_BRANCH" ] || m4args+=("-D_BRANCH_='\$UPDATER_BRANCH'")
[ -z "\$LISTS" ] || m4args+=("-D_LISTS_='\$LISTS'")
[ -z "\$L10N" ] || m4args+=("-D_LANGS_='\$L10N'")
[ -z "\$L10N" ] || m4args+=("-D_LANGS_=\$L10N")
m4 "\${m4args[@]}" "\$TURRIS_BUILD_DIR/helpers/medkit-updater-ng-config.m4" > root/etc/config/updater
## Overlay user's files
......
helpers/turris-version.sh
+ 1
− 1
View file @ e21afdd6
......@@ -68,7 +68,7 @@ endef
define Package/turris-version/install
\$(INSTALL_DIR) \$(1)/etc
echo \$(PKG_VERSION) > \$(1)/etc/turris-version
echo \$(PKG_VERSION) | sed 's|-.*||' > \$(1)/etc/turris-version
endef
\$(eval \$(call BuildPackage,turris-version))
......
lists/base-min.lua.m4
+ 1
− 1
View file @ e21afdd6
......@@ -94,7 +94,7 @@ Install("conntrack", { priority = 40 })
-- Wifi
Install("hostapd-common", "wireless-tools", "wpad", "iw", "iwinfo", { priority = 40 })
Install("ath10k-firmware-qca988x", { priority = 40 })
Install("ath10k-firmware-qca988x-ct", { priority = 40 })
if model:match("[Mm][Oo][Xx]") then
Install("mwifiex-sdio-firmware", { priority = 40 })
end
......
lists/kmod.list
+ 1
− 1
View file @ e21afdd6
# Wi-Fi drivers
ath10k
ath10k-ct
ath9k
# Firewall
......
lists/luci-controls.lua.m4
+ 2
− 2
View file @ e21afdd6
include(utils.m4)dnl Include utility macros
_FEATURE_GUARD_
forInstall(luci-app,ahcp,firewall,minidlna,mjpg-streamer,statistics,tinyproxy,transmission,upnp,wol)
forInstall(luci-app,ahcp,firewall,minidlna,mjpg-streamer,statistics,tinyproxy,transmission,upnp)
forInstall(luci-proto,openconnect,relay,vpnc)
Install("luci-theme-bootstrap", { priority = 40 })
if model:match('[Oo]mnia') or model:match('^[Tt]urris$') then
Install('luci-app-rainbow', { priority = 40 })
end
_LUCI_I18N_(ahcp, firewall, minidlna, statistics, tinyproxy, transmission, upnp, wol)
_LUCI_I18N_(ahcp, firewall, minidlna, statistics, tinyproxy, transmission, upnp)
_END_FEATURE_GUARD_
lists/netboot.lua.m4 0 → 100644
+ 7
− 0
View file @ e21afdd6
include(base-min.lua.m4)
_FEATURE_GUARD_
Install("turris-netboot-data", { priority = 40 })
_END_FEATURE_GUARD_
lists/netutils.lua.m4
+ 1
− 2
View file @ e21afdd6
......@@ -18,7 +18,6 @@ Install("ds-lite", "6in4", "6rd", "6to4", { priority = 40 })
forInstall(kmod,nf-nathelper-extra,usb-net-rndis,usb-net-qmi-wwan,usb-serial-option)
-- Luci
Install("luci-app-ddns", "luci-proto-3g", { priority = 40 })
_LUCI_I18N_(ddns)
Install("luci-proto-3g", { priority = 40 })
_END_FEATURE_GUARD_
lists/pakon.lua.m4
+ 3
− 0
View file @ e21afdd6
......@@ -2,5 +2,8 @@ include(utils.m4)dnl Include utility macros
_FEATURE_GUARD_
Install("foris-pakon-plugin", "pakon", "pakon-lists", "suricata-pakon", { priority = 40 })
if for_l10n then
for_l10n("foris-pakon-plugin-l10n-")
end
_END_FEATURE_GUARD_
patches/openwrt/hack/0007-MOX-Hacky-restart-to-make-sure-it-works.patch 0 → 100644
+ 63
− 0
View file @ e21afdd6
From b34fe18c7743dc181a3f168b73b971df9bb3f4fa Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Mon, 14 Jan 2019 17:06:17 +0100
Subject: [PATCH] MOX: Hacky restart to make sure it works
---
...m64-restart-Armada-3700-restart-code.patch | 44 +++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch
diff --git a/target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch b/target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch
new file mode 100644
index 0000000000..b442f71bee
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch
@@ -0,0 +1,44 @@
+From d419edef1a2429acfa35341eb6fbfaea3b6c87c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
+Date: Mon, 14 Jan 2019 17:00:04 +0100
+Subject: [PATCH] arm64: restart: Armada 3700 restart code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a bugfix for Turris Mox, do not send to mainline.
+
+Signed-off-by: Marek Behún <marek.behun@nic.cz>
+---
+ arch/arm64/kernel/process.c | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
+index 9e773732520c..2ae392c218fc 100644
+--- a/arch/arm64/kernel/process.c
++++ b/arch/arm64/kernel/process.c
+@@ -158,10 +158,17 @@ void machine_restart(char *cmd)
+ efi_reboot(reboot_mode, NULL);
+
+ /* Now call the architecture specific reboot code. */
+- if (arm_pm_restart)
+- arm_pm_restart(reboot_mode, cmd);
+- else
+- do_kernel_restart(cmd);
++ if (0) {
++ if (arm_pm_restart)
++ arm_pm_restart(reboot_mode, cmd);
++ else
++ do_kernel_restart(cmd);
++ } else {
++ void __iomem *r = ioremap(0xd0013000, 0x1000);
++ writel(0x1d1e, r + 0x840);
++ iounmap(r);
++ mdelay(1000);
++ }
+
+ /*
+ * Whoops - the architecture was unable to reboot.
+--
+2.19.2
+
--
2.20.1
patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support.patch
+ 0
− 137
View file @ e21afdd6
......@@ -8,33 +8,15 @@ some polishing.
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
target/linux/mpc85xx/Makefile | 2 +-
.../mpc85xx/base-files/etc/board.d/02_network | 6 +
.../arch/powerpc/boot/dts/turris.dts | 252 ++++++++++++++++++
target/linux/mpc85xx/p2020/config-default | 99 +++++++
target/linux/mpc85xx/p2020/profiles/turris.mk | 29 ++
target/linux/mpc85xx/p2020/target.mk | 6 +
...fsl_elbc_nand_add_ecc_mode_selection.patch | 227 ++++++++++++++++
7 files changed, 620 insertions(+), 1 deletion(-)
create mode 100644 target/linux/mpc85xx/files-4.14/arch/powerpc/boot/dts/turris.dts
create mode 100644 target/linux/mpc85xx/p2020/config-default
create mode 100644 target/linux/mpc85xx/p2020/profiles/turris.mk
create mode 100644 target/linux/mpc85xx/p2020/target.mk
create mode 100644 target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 1eac544..924572b 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Freescale MPC85xx
CPU_TYPE:=8540
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-SUBTARGETS:=generic p1020
+SUBTARGETS:=generic p1020 p2020
KERNEL_PATCHVER:=4.14
diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network
index 19f01a6..7679728 100755
--- a/target/linux/mpc85xx/base-files/etc/board.d/02_network
......@@ -310,113 +292,6 @@ index 0000000..5c5555f
+};
+
+/include/ "fsl/p2020si-post.dtsi"
diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default
new file mode 100644
index 0000000..89eef23
--- /dev/null
+++ b/target/linux/mpc85xx/p2020/config-default
@@ -0,0 +1,101 @@
+CONFIG_ADVANCED_OPTIONS=y
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_BCH=y
+CONFIG_BOOKE_WDT=y
+CONFIG_BUILD_BIN2C=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_RMAP=y
+CONFIG_CRC16=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_XZ=y
+# CONFIG_DYNAMIC_MEMSTART is not set
+CONFIG_FIXED_PHY=y
+CONFIG_FREEZER=y
+CONFIG_FSL_MPIC_TIMER_WAKEUP=y
+CONFIG_FSL_PMC=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_TBSYNC=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HIGHMEM=y
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_HUGETLBFS is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MPC=y
+CONFIG_IRQ_ALL_CPUS=y
+# CONFIG_KERNEL_START_BOOL is not set
+# CONFIG_LOWMEM_CAM_NUM_BOOL is not set
+CONFIG_LOWMEM_SIZE=0x20000000
+CONFIG_LOWMEM_SIZE_BOOL=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MATH_EMULATION=y
+# CONFIG_MATH_EMULATION_FULL is not set
+CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
+CONFIG_MPIC_MSGR=y
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_BCH=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_BCH=y
+CONFIG_MTD_NAND_FSL_ELBC=y
+# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
+# CONFIG_MTD_ROOTFS_SPLIT is not set
+# CONFIG_MTD_SPLIT is not set
+# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NET_FLOW_LIMIT=y
+CONFIG_NR_CPUS=2
+# CONFIG_PAGE_OFFSET_BOOL is not set
+CONFIG_PCI_MSI=y
+# CONFIG_PHYSICAL_START_BOOL is not set
+CONFIG_PHYS_64BIT=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PPC_MSI_BITMAP=y
+CONFIG_PTE_64BIT=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SMP=y
+CONFIG_STOP_MACHINE=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+# CONFIG_TASK_SIZE_BOOL is not set
+CONFIG_TREE_RCU=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_XZ=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_VGA_CONSOLE=n
+CONFIG_WATCHDOG_CORE=y
+CONFIG_XPS=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_FB_FSL_DIU=n
+CONFIG_CPU_HOTPLUG_STATE_CONTROL=n
diff --git a/target/linux/mpc85xx/p2020/profiles/turris.mk b/target/linux/mpc85xx/p2020/profiles/turris.mk
new file mode 100644
index 0000000..6c1d542
......@@ -452,18 +327,6 @@ index 0000000..6c1d542
+ Package set optimized for the Turris 1.X.
+endef
+$(eval $(call Profile,TURRIS))
diff --git a/target/linux/mpc85xx/p2020/target.mk b/target/linux/mpc85xx/p2020/target.mk
new file mode 100644
index 0000000..aa39263
--- /dev/null
+++ b/target/linux/mpc85xx/p2020/target.mk
@@ -0,0 +1,6 @@
+BOARDNAME:=P2020
+FEATURES += ramdisk
+
+define Target/Description
+ Build firmware images for Freescale P2020 based boards.
+endef
diff --git a/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch b/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
new file mode 100644
index 0000000..d661626
......
patches/packages/hack/0003-squid-disable-ccache.patch 0 → 100644
+ 38
− 0
View file @ e21afdd6
From d7dc3ff28088a97298f2f3f9a0168d5c3d10d382 Mon Sep 17 00:00:00 2001
From: Jan Pavlinec <jan.pavlinec@nic.cz>
Date: Fri, 11 Jan 2019 15:53:28 +0100
Subject: [PATCH] squid: disable ccache
---
net/squid/Makefile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/net/squid/Makefile b/net/squid/Makefile
index 19c5786..1e8213b 100644
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=squid
PKG_VERSION:=4.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
@@ -26,6 +26,12 @@ PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
+# Disable ccache since it causes compilation error
+ifneq ($(CONFIG_CCACHE),)
+HOSTCC=$(HOSTCC_NOCACHE)
+HOSTCXX=$(HOSTCXX_NOCACHE)
+endif
+
define Package/squid/Default
SECTION:=net
CATEGORY:=Network
--
2.7.4
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment