summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-lib/patches/patch-src_conf_c34
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/base-files/Makefile4
-rw-r--r--package/kismet/Makefile5
-rw-r--r--package/krb5/Makefile3
-rw-r--r--package/libgcc/Makefile6
-rw-r--r--package/openafs/Makefile1
-rw-r--r--package/pciutils/Makefile2
-rw-r--r--package/tor/Makefile4
-rw-r--r--package/uclibc++/Makefile2
-rw-r--r--package/v4l-utils/Makefile2
-rw-r--r--scripts/scan-pkgs.sh13
-rw-r--r--target/config/Config.in5
-rw-r--r--target/config/Config.in.runtime5
-rw-r--r--target/linux/config/Config.in.input2
-rw-r--r--target/linux/config/Config.in.usb4
-rw-r--r--target/sh/Makefile14
-rw-r--r--target/sh/kernel.config22
-rw-r--r--target/sh/sys-available/qemu-sh4 (renamed from target/sh/sys-available/qemu-sh)7
-rw-r--r--target/sh/sys-available/qemu-sh4eb14
-rw-r--r--toolchain/gcc/Makefile10
22 files changed, 114 insertions, 49 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index fa01868b7..01d5fee2e 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= alsa-lib
PKG_VERSION:= 1.0.27.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 3
PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b
PKG_DESCR:= ALSA sound library
PKG_SECTION:= libs
diff --git a/package/alsa-lib/patches/patch-src_conf_c b/package/alsa-lib/patches/patch-src_conf_c
index a6f296614..f3c1e70bd 100644
--- a/package/alsa-lib/patches/patch-src_conf_c
+++ b/package/alsa-lib/patches/patch-src_conf_c
@@ -1,13 +1,35 @@
-* added idea/patch from https://github.com/rofl0r/sabotage
-
+from alpinelinux
+ http://git.alpinelinux.org/cgit/aports/tree/main/alsa-lib/alsa-lib-portable-mutex.patch
--- alsa-lib-1.0.27.2.orig/src/conf.c 2013-07-08 14:31:36.000000000 +0200
-+++ alsa-lib-1.0.27.2/src/conf.c 2013-09-17 18:30:14.000000000 +0200
-@@ -428,7 +428,7 @@ beginning:</P>
++++ alsa-lib-1.0.27.2/src/conf.c 2013-10-02 14:32:15.000000000 +0200
+@@ -427,8 +427,8 @@ beginning:</P>
+ #ifndef DOC_HIDDEN
#ifdef HAVE_LIBPTHREAD
- static pthread_mutex_t snd_config_update_mutex =
+-static pthread_mutex_t snd_config_update_mutex =
- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+ {{{1,0,0,0,0,0,0,0,0,0}}};
++static pthread_mutex_t snd_config_update_mutex;
++static pthread_once_t snd_config_update_mutex_once = PTHREAD_ONCE_INIT;
#endif
struct _snd_config {
+@@ -472,8 +472,19 @@ typedef struct {
+
+ #ifdef HAVE_LIBPTHREAD
+
++static void snd_config_init_mutex(void)
++{
++ pthread_mutexattr_t attr;
++
++ pthread_mutexattr_init(&attr);
++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
++ pthread_mutex_init(&snd_config_update_mutex, &attr);
++ pthread_mutexattr_destroy(&attr);
++}
++
+ static inline void snd_config_lock(void)
+ {
++ pthread_once(&snd_config_update_mutex_once, snd_config_init_mutex);
+ pthread_mutex_lock(&snd_config_update_mutex);
+ }
+
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 0d6881c48..8c0f5922e 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3
PKG_DESCR:= ALSA mixer utility
PKG_SECTION:= multimedia
-PKG_DEPENDS:= alsa-lib libpthread libgcc
+PKG_DEPENDS:= alsa-lib libpthread libgcc librt
PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8ff743270..9d373653a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 59
+PKG_RELEASE:= 60
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
@@ -65,7 +65,7 @@ endif
ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
endif
-ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y)
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
$(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab
endif
$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 7ec5e7d0a..df2655956 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= kismet
PKG_VERSION:= 2011-01-R1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1fb1f024a7ca52814b255e2f2faccf3b
PKG_DESCR:= Kismet
PKG_SECTION:= wifi
-PKG_DEPENDS:= libpcap libncurses
+PKG_DEPENDS:= libpcap libncurses libpthread
PKG_BUILDDEP:= libpcap ncurses
PKG_URL:= http://www.kismetwireless.net/
PKG_SITES:= http://www.kismetwireless.net/code/
@@ -26,6 +26,7 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE
$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION}))
$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION}))
+TARGET_LDFLAGS+= -lpthread
CONFIGURE_ARGS+= --sysconfdir=/etc/kismet
pre-build:
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 3982ebfd9..da18b361d 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= krb5
PKG_VERSION:= 1.11.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 56f0ae274b285320b8a597cb89442449
PKG_DESCR:= MIT kerberos server
PKG_SECTION:= crypto
@@ -47,6 +47,7 @@ CONFIGURE_ARGS+= --disable-static \
--disable-profiled \
--with-system-ss \
--with-system-et \
+ --without-system-verto \
--without-tcl
CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \
ac_cv_func_regcomp=yes \
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 9c024504c..191d1f610 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -25,7 +25,11 @@ do-install:
ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
ifeq ($(ADK_LINUX_SH),y)
- ${CP} ${STAGING_TARGET_DIR}/lib/!m1/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_TARGET_LIB_GLIBC),y)
+ ${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+else
+ ${CP} ${STAGING_TARGET_DIR}/lib/!m4/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+endif
else
${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
endif
diff --git a/package/openafs/Makefile b/package/openafs/Makefile
index 37b37980d..a5a81dcc0 100644
--- a/package/openafs/Makefile
+++ b/package/openafs/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= net/fs
PKG_URL:= http://openafs.org
PKG_SITES:= http://www.openafs.org/dl/openafs/${PKG_VERSION}/
+PKG_LIBC_DEPENDS:= eglibc glibc musl
PKG_CFLINE_OPENAFS+= select ADK_KERNEL_KEYS
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-src.tar.bz2
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 1cde53cf7..142a04508 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 51ded74e4184d4a6c9f2ada95c28c067
PKG_DESCR:= PCI Utilities
PKG_SECTION:= utils
-PKG_DEPENDS:= zlib
+PKG_DEPENDS:= zlib libgcc
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/
PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/
diff --git a/package/tor/Makefile b/package/tor/Makefile
index cc0e98bbe..cfbce3456 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= tor
PKG_VERSION:= 0.2.3.25
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= a1c364189a9a66ed9daa8e6436489daf
PKG_DESCR:= An anonymous Internet communication system
PKG_SECTION:= proxy
@@ -27,6 +27,8 @@ CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
tor_cv_null_is_zero=yes \
tor_cv_unaligned_ok=yes
+CONFIGURE_ARGS+= --disable-gcc-hardening
+
post-install:
${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor
${INSTALL_DATA} ./files/torrc ${IDIR_TOR}/etc/tor/
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index c51819429..dfb93f197 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -16,7 +16,7 @@ PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_CFLINE_UCLIBCXX:= depends on ADK_TARGET_LIB_UCLIBC
+PKG_LIBC_DEPENDS:= uclibc
include ${TOPDIR}/mk/package.mk
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index f8e1e430f..17bed1502 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://linuxtv.org/downloads/v4l-utils/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_CFLINE_V4L_UTILS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc
PKG_SUBPKGS:= V4L_UTILS LIBV4L
include $(TOPDIR)/mk/package.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index b9888a4df..f794a8c37 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -104,7 +104,7 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then
fi
if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
- NEED_ZIP="$NEED_ZIP openjdk"
+ NEED_ZIP="$NEED_ZIP openjdk7"
fi
if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
@@ -133,6 +133,10 @@ if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then
NEED_AUTOCONF="$NEED_AUTOCONF automake"
fi
+if [[ -n $ADK_COMPILE_COROSYNC ]]; then
+ NEED_GROFF="$NEED_GROFF corosync"
+fi
+
if [[ -n $ADK_COMPILE_LIBTOOL ]]; then
NEED_AUTOMAKE="$NEED_AUTOMAKE libtool"
fi
@@ -305,6 +309,13 @@ if [[ -n $NEED_LIBSSLDEV ]]; then
fi
fi
+if [[ -n $NEED_GROFF ]]; then
+ if ! which groff >/dev/null 2>&1; then
+ echo >&2 You need groff to build $NEED_GROFF
+ out=1
+ fi
+fi
+
if [[ -n $NEED_MKFONTDIR ]]; then
if ! which mkfontdir >/dev/null 2>&1; then
echo >&2 You need mkfontdir to build $NEED_MKFONTDIR
diff --git a/target/config/Config.in b/target/config/Config.in
index 6a7c05d82..cd21deeec 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -482,7 +482,8 @@ config ADK_TARGET_CPU_ARCH
default "avr32" if ADK_LINUX_AVR32
default "sparc" if ADK_LINUX_SPARC
default "sparc64" if ADK_LINUX_SPARC64
- default "sh" if ADK_LINUX_SH
+ default "sh4" if ADK_LINUX_SH && ADK_little
+ default "sh4eb" if ADK_LINUX_SH && ADK_big
default "cris" if ADK_CPU_CRIS_V10
default "crisv32" if ADK_CPU_CRIS_V32
default "ppc" if ADK_CPU_PPC
@@ -602,6 +603,7 @@ config ADK_TARGET_LIB_EGLIBC
ADK_LINUX_MIPS64EL || \
ADK_LINUX_PPC || \
ADK_LINUX_PPC64 || \
+ ADK_LINUX_SH || \
ADK_LINUX_SPARC || \
ADK_LINUX_SPARC64 || \
ADK_LINUX_X86 || \
@@ -622,6 +624,7 @@ config ADK_TARGET_LIB_GLIBC
ADK_LINUX_MIPS64EL || \
ADK_LINUX_PPC || \
ADK_LINUX_PPC64 || \
+ ADK_LINUX_SH || \
ADK_LINUX_SPARC || \
ADK_LINUX_SPARC64 || \
ADK_LINUX_X86 || \
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index ddd0e3d2a..cf996368f 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -23,6 +23,7 @@ config ADK_RUNTIME_PASSWORD
config ADK_RUNTIME_TMPFS_SIZE
string "size of /tmp in memory (kB)"
default "16384" if ADK_TARGET_SYSTEM_IBM_X40
+ default "16384" if ADK_TARGET_SYSTEM_RASPBERRY_PI
default "2048"
help
Size of /tmp in memory in Kilobyte.
@@ -35,8 +36,8 @@ config ADK_RUNTIME_TIMEZONE
choice
prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI
-default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB
+default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
default ADK_RUNTIME_CONSOLE_SERIAL
config ADK_RUNTIME_CONSOLE_VGA
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index a4079c37b..587a7f2c9 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -5,6 +5,7 @@ config ADK_KERNEL_INPUT
boolean
default y if ADK_TARGET_SYSTEM_QEMU_I686
default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_ARANYM_M68K
default y if ADK_TARGET_SYSTEM_VBOX_I686
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
@@ -143,6 +144,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
depends on ADK_TARGET_WITH_USB
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4
default n
config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index fa0c3171f..1459039b6 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -31,7 +31,7 @@ config ADK_KPACKAGE_KMOD_USB
select ADK_KERNEL_NLS
depends on !ADK_KERNEL_USB
default y if ADK_TARGET_SYSTEM_QEMU_I686
- default y if ADK_TARGET_SYSTEM_QEMU_SH
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
@@ -116,7 +116,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
default y if ADK_TARGET_SYSTEM_INTEL_ATOM
default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_TARGET_SYSTEM_QEMU_SH
+ default y if ADK_TARGET_SYSTEM_QEMU_SH4
default n
help
The Open Host Controller Interface (OHCI) is a standard for accessing
diff --git a/target/sh/Makefile b/target/sh/Makefile
index 86570eaeb..5cf42b342 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -11,9 +11,15 @@ KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage
ifeq ($(ADK_TARGET_FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
- @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+ifneq ($(ADK_HARDWARE_QEMU),)
+ @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+ @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
+ @echo "Use following command to create a QEMU Image:"
+ @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+ @echo "Start qemu with following options:"
+ @echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+endif
endif
ifeq ($(ADK_TARGET_FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
@@ -22,7 +28,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-sh4 -M r2d -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -31,6 +37,6 @@ imageinstall: createinitramfs
@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-sh4 -M r2d -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
+ @echo 'qemu-system-{CPU_ARCH} -M r2d -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
endif
endif
diff --git a/target/sh/kernel.config b/target/sh/kernel.config
index 8767d7ecd..85fbc2e4b 100644
--- a/target/sh/kernel.config
+++ b/target/sh/kernel.config
@@ -101,7 +101,7 @@ CONFIG_UIDGID_CONVERTED=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_EXPERT=y
@@ -132,7 +132,7 @@ CONFIG_PERF_EVENTS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
-CONFIG_COMPAT_BRK=y
+# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
@@ -278,7 +278,7 @@ CONFIG_ZONE_DMA_FLAG=0
CONFIG_NR_QUICK=1
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_NEED_PER_CPU_KM=y
# CONFIG_CLEANCACHE is not set
@@ -350,11 +350,11 @@ CONFIG_SH_CLK_CPG_LEGACY=y
#
# Kernel features
#
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
+CONFIG_HZ=100
# CONFIG_SCHED_HRTICK is not set
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
@@ -385,7 +385,7 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
CONFIG_ENTRY_OFFSET=0x00001000
CONFIG_CMDLINE_OVERWRITE=y
# CONFIG_CMDLINE_EXTEND is not set
-CONFIG_CMDLINE="console=ttySC1 console=tty0"
+CONFIG_CMDLINE="console=tty0"
#
# Bus options
@@ -769,12 +769,8 @@ CONFIG_ETHERNET=y
# CONFIG_NET_PACKET_ENGINE is not set
# CONFIG_NET_VENDOR_QLOGIC is not set
CONFIG_NET_VENDOR_REALTEK=y
-# CONFIG_8139CP is not set
-CONFIG_8139TOO=y
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_8139CP=y
+# CONFIG_8139TOO is not set
# CONFIG_R8169 is not set
# CONFIG_NET_VENDOR_RDC is not set
# CONFIG_NET_VENDOR_SEEQ is not set
diff --git a/target/sh/sys-available/qemu-sh b/target/sh/sys-available/qemu-sh4
index 4ea65fb3b..54f13fb65 100644
--- a/target/sh/sys-available/qemu-sh
+++ b/target/sh/sys-available/qemu-sh4
@@ -1,7 +1,8 @@
-config ADK_TARGET_SYSTEM_QEMU_SH
- bool "Qemu Emulator"
+config ADK_TARGET_SYSTEM_QEMU_SH4
+ bool "Qemu Emulator (Little Endian)"
select ADK_sh
- select ADK_qemu_sh
+ select ADK_little
+ select ADK_qemu_sh4
select ADK_CPU_SH4
select ADK_HARDWARE_QEMU
select ADK_TARGET_WITH_VGA
diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb
new file mode 100644
index 000000000..70365d7d4
--- /dev/null
+++ b/target/sh/sys-available/qemu-sh4eb
@@ -0,0 +1,14 @@
+config ADK_TARGET_SYSTEM_QEMU_SH4EB
+ bool "Qemu Emulator (Big Endian)"
+ select ADK_sh
+ select ADK_big
+ select ADK_qemu_sh4
+ select ADK_CPU_SH4
+ select ADK_KERNEL_CPU_BIG_ENDIAN
+ select ADK_HARDWARE_QEMU
+ select ADK_TARGET_WITH_VGA
+ select ADK_TARGET_WITH_INPUT
+ select ADK_TARGET_WITH_USB
+ help
+ Support for Qemu Emulator (superh).
+
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 5d00be19b..d09264718 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -33,11 +33,8 @@ else
GCC_CONFOPTS+= --disable-sjlj-exceptions
endif
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-ifeq ($(ADK_LINUX_X86_64),y)
-GCC_CONFOPTS+= --with-multilib-list=$(ADK_MULTILIB_TARGET)
-endif
-GCC_CONFOPTS+= --enable-multilib
+ifeq ($(ADK_LINUX_SH),y)
+GCC_CONFOPTS+= --with-multilib-list=m4,m4-nofpu
else
GCC_CONFOPTS+= --disable-biarch \
--disable-multilib
@@ -116,6 +113,9 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured:
ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib
ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+ifeq ($(ADK_LINUX_SH),y)
+ (cd ${STAGING_TARGET_DIR}/ && ln -sf . m4 && ln -sf . m4-nofpu)
+endif
sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure
cd $(GCC_BUILD_DIR_MINIMAL); PATH='$(TARGET_PATH)' \
$(WRKBUILD)/configure \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 21:10:23 +0000