From ef3e0b89e65ecc1bdcb0463d89dac8077dc45d34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2015 11:13:06 -0500 Subject: add support for pcengines-alix Readd Alix2d support, tested via NFS boot. Fix IPSec kernel module loading. --- mk/modules.mk | 10 +++++++++- package/adkinstall/Makefile | 4 ++-- package/adkinstall/src/adkinstall | 31 ++++++++++++++++++++++++++++++- package/libiconv-tiny/Makefile | 2 +- target/config/Config.in.kernel | 1 + target/config/Config.in.subsystem | 14 ++++++++++++++ target/linux/config/Config.in.block | 10 +++------- target/linux/config/Config.in.crypto | 1 + target/linux/config/Config.in.ethernet | 4 +++- target/linux/config/Config.in.ipsec | 29 ++++++++++++----------------- target/linux/config/Config.in.lib | 4 ++++ target/linux/config/Config.in.usb | 12 +++--------- target/linux/config/Config.in.watchdog | 4 +--- target/x86/kernel/pcengines-alix | 4 ++++ target/x86/systems/pcengines-alix | 14 ++++++++++++++ 15 files changed, 102 insertions(+), 42 deletions(-) create mode 100644 target/x86/kernel/pcengines-alix create mode 100644 target/x86/systems/pcengines-alix diff --git a/mk/modules.mk b/mk/modules.mk index b515b4470..88b5d07e2 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -358,6 +358,10 @@ $(eval $(call KMOD_template,NET_ACT_PEDIT,net-act-pedit,\ # IPsec # +$(eval $(call KMOD_template,XFRM_ALGO,xfrm-algo,\ + $(MODULES_DIR)/kernel/net/xfrm/xfrm_algo \ +,59)) + $(eval $(call KMOD_template,NET_KEY,net-key,\ $(MODULES_DIR)/kernel/net/key/af_key \ ,60)) @@ -1027,7 +1031,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ $(MODULES_DIR)/kernel/crypto/deflate \ -,10, kmod-zlib-deflate)) +,10, kmod-zlib-deflate kmod-zlib-inflate)) $(eval $(call KMOD_template,CRYPTO_LZO,crypto-lzo,\ $(MODULES_DIR)/kernel/crypto/lzo \ @@ -1736,6 +1740,10 @@ $(eval $(call KMOD_template,ZLIB_DEFLATE,zlib-deflate,\ $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \ ,01)) +$(eval $(call KMOD_template,ZLIB_INFLATE,zlib-inflate,\ + $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \ +,01)) + $(eval $(call KMOD_template,LZO_COMPRESS,lzo-compress,\ $(MODULES_DIR)/kernel/lib/lzo/lzo_compress \ ,01)) diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 3702ca698..1674d6d75 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -6,12 +6,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= adkinstall PKG_VERSION:= 2.0 PKG_RELEASE:= 3 -PKG_DESCR:= adk disk/flash installer +PKG_DESCR:= disk/flash installer PKG_SECTION:= base/misc PKG_DEPENDS:= mke2fs parted sfdisk dosfstools mksh PKG_CFLINE_ADKINSTALL:= select ADK_KERNEL_EXT4_FS -PKG_SYSTEM_DEPENDS:= mikrotik-rb532 lemote-yeelong pcengines-apu ibm-x40 +PKG_SYSTEM_DEPENDS:= mikrotik-rb532 lemote-yeelong pcengines-apu pcengines-alix ibm-x40 PKG_DEPENDS_PCENGINES_APU:= grub grub-tools PKG_DEPENDS_IBM_X40:= grub grub-tools NO_DISTFILES:= 1 diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall index f0d901fdb..a67bcdaf4 100644 --- a/package/adkinstall/src/adkinstall +++ b/package/adkinstall/src/adkinstall @@ -44,6 +44,14 @@ EOF exit 1 } +function pcengines-alix-help { + cat >&2 < + -f: filesystem (default ext4) + -h: help text +EOF + exit 1 +} case $target { (ibm-x40) @@ -92,6 +100,27 @@ case $target { archive=$1 fi ;; +(pcengines-alix) + cfgfssize=32768 + fs=ext4 + while getopts "f:" ch; do + case $ch in + f) + fs=$OPTARG + ;; + *) + pcengines-alix-help + exit 1 + ;; + esac + done + shift $((OPTIND - 1)) + if [ -z $1 ];then + pcengines-alix-help + else + archive=$1 + fi + ;; (mikrotik-rb532) cfgfssize=32768 nand=0 @@ -258,7 +287,7 @@ case $target { fix_perm /mnt umount /mnt ;; -(pcengines-apu) +(pcengines-apu|pcengines-alix) get_max_size /dev/sda create_label /dev/sda create_partition /dev/sda ext2 16385 $rootsize diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile index 2889a58b9..7687128fa 100644 --- a/package/libiconv-tiny/Makefile +++ b/package/libiconv-tiny/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= 1410d40697a5eda9de5e433edfbed540b66c3e1af7374b8507ab9c468b7d9012 PKG_DESCR:= iconv stub and replacement PKG_SECTION:= libs/misc PKG_URL:= http://www.openwrt.org/ -PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_SITES:= http://distfiles.openadk.org/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index effd374b3..ace5bb563 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -77,3 +77,4 @@ config ADK_TARGET_KERNEL_MINICONFIG default "sun-voyager" if ADK_TARGET_SYSTEM_SUN_VOYAGER default "banana-pro" if ADK_TARGET_SYSTEM_BANANA_PRO default "xilinx-kintex7" if ADK_TARGET_SYSTEM_XILINX_KINTEX7 + default "pcengines-alix" if ADK_TARGET_SYSTEM_PCENGINES_ALIX diff --git a/target/config/Config.in.subsystem b/target/config/Config.in.subsystem index 492bc7dc5..052d84033 100644 --- a/target/config/Config.in.subsystem +++ b/target/config/Config.in.subsystem @@ -1,3 +1,17 @@ +choice +prompt "PCengines ALIX model" +depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX + +config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D + bool "PCengines Alix 2D" + +config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + bool "PCengines Alix 1C" + select ADK_TARGET_WITH_SOUND + select ADK_TARGET_WITH_VGA + +endchoice + choice prompt "Solidrun IMX6 model" depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 519f6284a..e8f17f55c 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -119,13 +119,9 @@ config ADK_KERNEL_PATA_AMD select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || \ - ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || \ - ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || \ - ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX \ + || ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 8b1ceb056..8af4bde0f 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -547,6 +547,7 @@ config ADK_KERNEL_CRYPTO_DEFLATE tristate select ADK_KERNEL_CRYPTO_ALGAPI select ADK_KERNEL_ZLIB_DEFLATE + select ADK_KERNEL_ZLIB_INFLATE default n help This is the Deflate algorithm (RFC1951), specified for use in diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index e74c30123..23dbebf58 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -110,8 +110,10 @@ config ADK_KERNEL_VIA_RHINE tristate "VIA Rhine ethernet driver" select ADK_KERNEL_NET_VENDOR_VIA select ADK_KERNEL_VIA_RHINE_MMIO - depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 + depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 \ + || ADK_TARGET_SYSTEM_PCENGINES_ALIX default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX default n help VIA Rhine ethernet driver diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec index da638c40c..60a7a392b 100644 --- a/target/linux/config/Config.in.ipsec +++ b/target/linux/config/Config.in.ipsec @@ -1,37 +1,35 @@ menu "IPSec support" -config ADK_KERNEL_NET_KEY - prompt "PF_KEYv2 socket family" +config ADK_KERNEL_XFRM_ALGO tristate + +config ADK_KERNEL_NET_KEY + tristate "PF_KEYv2 socket family" default n help PF_KEYv2 socket family, compatible to KAME ones. config ADK_KERNEL_XFRM_USER - prompt "IPsec usertools support" - tristate + tristate "IPsec usertools support" + select ADK_KERNEL_XFRM_ALGO default n - help config ADK_KERNEL_INET_AH - prompt "IPsec AH support" - tristate + tristate "IPsec AH support" select ADK_KERNEL_CRYPTO_HASH default n help Support for IPsec AH. config ADK_KERNEL_INET_ESP - prompt "IPsec ESP support" - tristate + tristate "IPsec ESP support" select ADK_KERNEL_CRYPTO_AEAD default n help Support for IPsec ESP. config ADK_KERNEL_INET_IPCOMP - prompt "IP Payload Compression" - tristate + tristate "IP Payload Compression" select ADK_KERNEL_CRYPTO_DEFLATE select ADK_KERNEL_INET_TUNNEL default n @@ -40,22 +38,19 @@ config ADK_KERNEL_INET_IPCOMP typically needed for IPsec. config ADK_KERNEL_INET_XFRM_MODE_TRANSPORT - prompt "IPsec transport mode" - tristate + tristate "IPsec transport mode" default n help Support for IPsec transport mode. config ADK_KERNEL_INET_XFRM_MODE_TUNNEL - prompt "IPsec tunnel mode" - tristate + tristate "IPsec tunnel mode" default n help Support for IPsec tunnel mode. config ADK_KERNEL_INET_XFRM_MODE_BEET - prompt "IPsec BEET mode" - tristate + tristate "IPsec BEET mode" default n help Support for IPsec BEET mode. diff --git a/target/linux/config/Config.in.lib b/target/linux/config/Config.in.lib index 9c34f917d..29f3899c6 100644 --- a/target/linux/config/Config.in.lib +++ b/target/linux/config/Config.in.lib @@ -44,6 +44,10 @@ config ADK_KERNEL_ZLIB_DEFLATE tristate default n +config ADK_KERNEL_ZLIB_INFLATE + tristate + default n + config ADK_KERNEL_LZO_COMPRESS tristate default n diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index d4e3b7a8b..de1466a9c 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -33,9 +33,7 @@ config ADK_KERNEL_USB tristate "USB support" select ADK_KERNEL_NLS select ADK_KERNEL_USB_SUPPORT - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX default m if ADK_TARGET_SYSTEM_IBM_X40 default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 @@ -80,9 +78,7 @@ config ADK_KERNEL_USB_EHCI_HCD depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_BOARD_BCM28XX depends on ADK_KERNEL_USB - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX default m if ADK_TARGET_SYSTEM_IBM_X40 default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 @@ -129,9 +125,7 @@ config ADK_KERNEL_USB_OHCI_HCD tristate "Support for OHCI controllers" depends on ADK_KERNEL_USB depends on !ADK_TARGET_BOARD_BCM28XX - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 9f1673a53..70fafbc60 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -68,9 +68,7 @@ config ADK_KERNEL_GEODE_WDT select ADK_KERNEL_MISC_DEVICES select ADK_KERNEL_CS5535_MFGPT select ADK_KERNEL_CS5535_CLOCK_EVENT_SRC - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX default n help Geode watchdog. diff --git a/target/x86/kernel/pcengines-alix b/target/x86/kernel/pcengines-alix new file mode 100644 index 000000000..849852a65 --- /dev/null +++ b/target/x86/kernel/pcengines-alix @@ -0,0 +1,4 @@ +CONFIG_X86=y +CONFIG_X86_32=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/x86/systems/pcengines-alix b/target/x86/systems/pcengines-alix new file mode 100644 index 000000000..bfc6150fb --- /dev/null +++ b/target/x86/systems/pcengines-alix @@ -0,0 +1,14 @@ +config ADK_TARGET_SYSTEM_PCENGINES_ALIX + bool "PCengines ALIX" + select ADK_CPU_GEODE + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_PATA + select ADK_TARGET_WITH_GEODE_CRYPTO + select ADK_TARGET_WITH_WATCHDOG + select ADK_TARGET_KERNEL_BZIMAGE + select ADK_PACKAGE_GRUB + help + Support for PCengines ALIX Boards. + -- cgit v1.2.3