diff options
| -rw-r--r-- | mk/kernel-vars.mk | 3 | ||||
| -rw-r--r-- | package/busybox/Makefile | 8 | ||||
| -rw-r--r-- | package/busybox/files/network.wait | 29 | ||||
| -rwxr-xr-x | scripts/stat | 19 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 35 | ||||
| -rw-r--r-- | target/config/Config.in.qemuopts | 6 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 5 | ||||
| -rw-r--r-- | target/config/Config.in.tc | 30 | ||||
| -rw-r--r-- | target/linux/config/Config.in.graphics | 9 |
9 files changed, 139 insertions, 5 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 17a8d23a2..834af71cc 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -11,8 +11,9 @@ KERNEL_MAKE_OPTS:= V=1 \ CONFIG_SHELL='${SHELL}' # regex for relocs needs pcre on Darwin -ifeq ($(ADK_HOST_DARWIN),y) +ifeq (${OStype},Darwin) KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}' HOSTLDFLAGS='-lpcreposix' +KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I ${ADK_TOPDIR}/adk/include -DKBUILD_NO_NLS' else KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}' endif diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 313acbfc9..f20536dd4 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.23.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps @@ -54,7 +54,11 @@ do-install: $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ ifeq ($(BUSYBOX_IFUPDOWN),y) $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d - $(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d +ifeq ($(ADK_RUNTIME_WAIT_FOR_ETHERNET),y) + $(INSTALL_BIN) ./files/network.wait $(IDIR_BUSYBOX)/etc/init.d/network +else + $(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d/network +endif endif ifeq ($(ADK_DEBUG),y) ${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \ diff --git a/package/busybox/files/network.wait b/package/busybox/files/network.wait new file mode 100644 index 000000000..ad04f7f94 --- /dev/null +++ b/package/busybox/files/network.wait @@ -0,0 +1,29 @@ +#!/bin/sh +#PKG busybox +#INIT 40 +. /etc/rc.conf +case $1 in +autostart) + test x"${network:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + [ -f /etc/network/interfaces ] || exit 1 + echo "Waiting for eth0 ... " + while [ ! -d /sys/class/net/eth0 ]; do sleep 1; done + ifup -a > /dev/null + ;; +autostop|stop) + [ -f /etc/network/interfaces ] || exit 1 + ifdown -a > /dev/null + ;; +restart) + sh $0 stop + exec sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/scripts/stat b/scripts/stat new file mode 100755 index 000000000..bf9136338 --- /dev/null +++ b/scripts/stat @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +declare -a opts +while [[ "$1" ]]; do + case "$1" in + -c) shift ;; + -f) shift ;; + *) opts+=("$1") ;; + esac + shift +done + +if /usr/bin/stat -qs .>/dev/null 2>&1; then + /usr/bin/stat -f %z "${opts[@]}" +else + /usr/bin/stat -c %s "${opts[@]}" +fi diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index b15204074..4a008790d 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -127,11 +127,36 @@ config ADK_CPU_CF_5216 select ADK_CPU_CF select ADK_TARGET_WITH_LT +config ADK_CPU_CF_52235 + bool + select ADK_CPU_CF + select ADK_TARGET_WITH_LT + config ADK_CPU_CF_5225 bool select ADK_CPU_CF select ADK_TARGET_WITH_LT +config ADK_CPU_CF_52259 + bool + select ADK_CPU_CF + select ADK_TARGET_WITH_LT + +config ADK_CPU_CF_5235 + bool + select ADK_CPU_CF + select ADK_TARGET_WITH_LT + +config ADK_CPU_CF_5249 + bool + select ADK_CPU_CF + select ADK_TARGET_WITH_LT + +config ADK_CPU_CF_5250 + bool + select ADK_CPU_CF + select ADK_TARGET_WITH_LT + config ADK_CPU_CORTEX_M3 bool select ADK_TARGET_WITH_LT @@ -404,7 +429,12 @@ config ADK_TARGET_GCC_CPU default "5211a" if ADK_CPU_CF_5211A default "5213" if ADK_CPU_CF_5213 default "5216" if ADK_CPU_CF_5216 + default "52235" if ADK_CPU_CF_52235 default "5225" if ADK_CPU_CF_5225 + default "52259" if ADK_CPU_CF_52259 + default "5235" if ADK_CPU_CF_5235 + default "5249" if ADK_CPU_CF_5249 + default "5250" if ADK_CPU_CF_5250 default "arc700" if ADK_CPU_ARC700 default "archs" if ADK_CPU_ARC_HS default "arm1176jzf-s" if ADK_CPU_ARM1176JZF_S @@ -474,7 +504,12 @@ config ADK_TARGET_CPU_TYPE default "5211a" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5211A default "5213" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5213 default "5216" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5216 + default "52235" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_52235 default "5225" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5225 + default "52259" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_52259 + default "5235" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5235 + default "5249" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5249 + default "5250" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5250 default "cortex_a5" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A5 default "cortex_a7" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A7 default "cortex_a8" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A8 diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 40d129b12..7d34aa3e9 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -64,7 +64,10 @@ endchoice choice prompt "Qemu Emulation with graphical output" -depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_SH +depends on ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 \ + || ADK_TARGET_SYSTEM_QEMU_SH \ + || ADK_TARGET_SYSTEM_QEMU_X86_64 \ + || ADK_TARGET_SYSTEM_QEMU_X86 config ADK_TARGET_QEMU_WITHOUT_GRAPHIC bool "disabled" @@ -82,6 +85,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_INPUT_MOUSE select ADK_KERNEL_INPUT_MOUSEDEV + select ADK_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH select ADK_KERNEL_DRM_CIRRUS_QEMU if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 7ac4c92f8..2e33623c3 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -332,6 +332,11 @@ config ADK_BINSH_ZSH endchoice +# workaround for USB ethernet f.e. Raspberry Pi2 +config ADK_RUNTIME_WAIT_FOR_ETHERNET + bool + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 + config ADK_SIMPLE_NETWORK_CONFIG bool "simple network configuration" help diff --git a/target/config/Config.in.tc b/target/config/Config.in.tc index 049239008..6a4cce527 100644 --- a/target/config/Config.in.tc +++ b/target/config/Config.in.tc @@ -172,12 +172,42 @@ config ADK_TARGET_CPU_CF_5216 select ADK_TARGET_UCLINUX depends on ADK_TARGET_ARCH_M68K +config ADK_TARGET_CPU_CF_52235 + bool "coldfire 52235" + select ADK_CPU_CF_52235 + select ADK_TARGET_UCLINUX + depends on ADK_TARGET_ARCH_M68K + config ADK_TARGET_CPU_CF_5225 bool "coldfire 5225" select ADK_CPU_CF_5225 select ADK_TARGET_UCLINUX depends on ADK_TARGET_ARCH_M68K +config ADK_TARGET_CPU_CF_52259 + bool "coldfire 52259" + select ADK_CPU_CF_52259 + select ADK_TARGET_UCLINUX + depends on ADK_TARGET_ARCH_M68K + +config ADK_TARGET_CPU_CF_5235 + bool "coldfire 5235" + select ADK_CPU_CF_5235 + select ADK_TARGET_UCLINUX + depends on ADK_TARGET_ARCH_M68K + +config ADK_TARGET_CPU_CF_5249 + bool "coldfire 5249" + select ADK_CPU_CF_5249 + select ADK_TARGET_UCLINUX + depends on ADK_TARGET_ARCH_M68K + +config ADK_TARGET_CPU_CF_5250 + bool "coldfire 5250" + select ADK_CPU_CF_5250 + select ADK_TARGET_UCLINUX + depends on ADK_TARGET_ARCH_M68K + config ADK_TARGET_CPU_X86_I486 bool "i486" select ADK_CPU_I486 diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index b93237ad4..4993dd57d 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -99,6 +99,13 @@ config ADK_KERNEL_FB_ATARI default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n +config ADK_KERNEL_FB_ARMCLCD + boolean + +config ADK_KERNEL_PLAT_VERSATILE_CLCD + boolean + select ADK_KERNEL_FB_ARMCLCD + config ADK_KERNEL_FB_CIRRUS boolean @@ -106,8 +113,8 @@ config ADK_KERNEL_FB_GEODE boolean config ADK_KERNEL_FB_SM501 - select ADK_KERNEL_MFD_SM501 boolean + select ADK_KERNEL_MFD_SM501 config ADK_KERNEL_DRM boolean |