summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/modules.mk6
-rwxr-xr-xpackage/base-files/extra/init2
-rwxr-xr-xscripts/install.sh1
-rwxr-xr-xscripts/md5sum4
-rw-r--r--target/Config.in1
-rw-r--r--target/linux/patches/2.6.29.1/cygwin-compat.patch (renamed from target/linux/patches/2.6.29/cygwin-compat.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/freebsd-compat.patch (renamed from target/linux/patches/2.6.29/freebsd-compat.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/mips-gcc-44.patch (renamed from target/linux/patches/2.6.29/mips-gcc-44.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/ocf.patch (renamed from target/linux/patches/2.6.29/ocf.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/swconfig.patch (renamed from target/linux/patches/2.6.29/swconfig.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/yaffs2.patch (renamed from target/linux/patches/2.6.29/yaffs2.patch)0
-rw-r--r--target/linux/patches/2.6.30/mtd-root.patch62
-rw-r--r--toolchain/gcc/Makefile7
13 files changed, 78 insertions, 5 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 2c6e12eab..e1350ac50 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -30,6 +30,7 @@ $(eval $(call KMOD_template,ATH5K,mac80211-ath5k,\
,20, kmod-led-class))
$(eval $(call KMOD_template,RT2X00,mac80211-rt2x00,\
+ $(MODULES_DIR)/kernel/drivers/input/input-polldev \
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \
$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
,17))
@@ -507,6 +508,8 @@ $(eval $(call KMOD_template,MD_RAID1,md-raid1,\
,35))
$(eval $(call KMOD_template,MD_RAID456,md-raid456,\
+ $(MODULES_DIR)/kernel/crypto/async_tx/async_xor \
+ $(MODULES_DIR)/kernel/crypto/async_tx/async_tx \
$(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \
$(MODULES_DIR)/kernel/drivers/md/raid456 \
,35))
@@ -523,6 +526,7 @@ $(eval $(call KMOD_template,DM_CRYPT,dm-crypt,\
,40))
$(eval $(call KMOD_template,DM_MIRROR,dm-mirror,\
+ $(MODULES_DIR)/kernel/drivers/md/dm-log \
$(MODULES_DIR)/kernel/drivers/md/dm-region-hash \
$(MODULES_DIR)/kernel/drivers/md/dm-mirror \
,40))
@@ -549,6 +553,7 @@ $(eval $(call KMOD_template,CRYPTO_AEAD,crypto-aead,\
,04))
$(eval $(call KMOD_template,CRYPTO_BLKCIPHER,crypto-blkcipher,\
+ $(MODULES_DIR)/kernel/crypto/crypto_wq \
$(MODULES_DIR)/kernel/crypto/crypto_blkcipher \
$(MODULES_DIR)/kernel/crypto/rng \
$(MODULES_DIR)/kernel/crypto/krng \
@@ -561,6 +566,7 @@ $(eval $(call KMOD_template,CRYPTO_HASH,crypto-hash,\
,05))
$(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\
+ $(MODULES_DIR)/kernel/crypto/pcompress \
$(MODULES_DIR)/kernel/crypto/cryptomgr \
,06))
diff --git a/package/base-files/extra/init b/package/base-files/extra/init
index 0d4f3d623..65f33e3d6 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/extra/init
@@ -3,7 +3,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount -nt proc proc /proc
size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo)
mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
-mount none /tmp -t tmpfs -o size=$size
+mount none /tmp -t tmpfs -o size=${size}k
mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
mount -o nosuid,size=64k,mode=0755 -t tmpfs mdev /dev
mkdir /dev/pts /dev/shm
diff --git a/scripts/install.sh b/scripts/install.sh
index eadb61869..926c03b6b 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -157,6 +157,7 @@ if [ $rb532 -ne 0 ];then
$sfdisk --change-id $1 1 27
$sfdisk --change-id $1 3 88
dd if=$3 of=${1}1
+ sync
else
rootpart=${1}1
if [ $cfgfs -eq 0 ];then
diff --git a/scripts/md5sum b/scripts/md5sum
index 6a95a4707..24e1e9fac 100755
--- a/scripts/md5sum
+++ b/scripts/md5sum
@@ -2,8 +2,8 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-if [ -x /usr/bin/md5sum ];then
- md5sum "$@"
+if [ -x /usr/bin/md5sum ]; then
+ /usr/bin/md5sum "$@"
else
md5 "$@" | sed 's#MD5 (\([^)]*\)) = \(.*\)#\2 \1#'
fi
diff --git a/target/Config.in b/target/Config.in
index 318b70121..22d4c48a9 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -203,6 +203,7 @@ config ADK_LINUX_X86_QEMU
bool "x86"
select ADK_qemu_x86
select ADK_KPACKAGE_KMOD_NE2K_PCI
+ select ADK_KERNEL_INPUT_KEYBOARD
help
Qemu support for x86 architecture.
diff --git a/target/linux/patches/2.6.29/cygwin-compat.patch b/target/linux/patches/2.6.29.1/cygwin-compat.patch
index 453748618..453748618 100644
--- a/target/linux/patches/2.6.29/cygwin-compat.patch
+++ b/target/linux/patches/2.6.29.1/cygwin-compat.patch
diff --git a/target/linux/patches/2.6.29/freebsd-compat.patch b/target/linux/patches/2.6.29.1/freebsd-compat.patch
index fb09008f6..fb09008f6 100644
--- a/target/linux/patches/2.6.29/freebsd-compat.patch
+++ b/target/linux/patches/2.6.29.1/freebsd-compat.patch
diff --git a/target/linux/patches/2.6.29/mips-gcc-44.patch b/target/linux/patches/2.6.29.1/mips-gcc-44.patch
index ccee68b9b..ccee68b9b 100644
--- a/target/linux/patches/2.6.29/mips-gcc-44.patch
+++ b/target/linux/patches/2.6.29.1/mips-gcc-44.patch
diff --git a/target/linux/patches/2.6.29/ocf.patch b/target/linux/patches/2.6.29.1/ocf.patch
index 69cffc1da..69cffc1da 100644
--- a/target/linux/patches/2.6.29/ocf.patch
+++ b/target/linux/patches/2.6.29.1/ocf.patch
diff --git a/target/linux/patches/2.6.29/swconfig.patch b/target/linux/patches/2.6.29.1/swconfig.patch
index 4e34e5ff5..4e34e5ff5 100644
--- a/target/linux/patches/2.6.29/swconfig.patch
+++ b/target/linux/patches/2.6.29.1/swconfig.patch
diff --git a/target/linux/patches/2.6.29/yaffs2.patch b/target/linux/patches/2.6.29.1/yaffs2.patch
index 6c384b74c..6c384b74c 100644
--- a/target/linux/patches/2.6.29/yaffs2.patch
+++ b/target/linux/patches/2.6.29.1/yaffs2.patch
diff --git a/target/linux/patches/2.6.30/mtd-root.patch b/target/linux/patches/2.6.30/mtd-root.patch
new file mode 100644
index 000000000..3576848be
--- /dev/null
+++ b/target/linux/patches/2.6.30/mtd-root.patch
@@ -0,0 +1,62 @@
+diff -Nur linux-2.6.29.1.orig/drivers/mtd/Kconfig linux-2.6.29.1/drivers/mtd/Kconfig
+--- linux-2.6.29.1.orig/drivers/mtd/Kconfig 2009-04-02 22:55:27.000000000 +0200
++++ linux-2.6.29.1/drivers/mtd/Kconfig 2009-05-02 19:24:14.444062164 +0200
+@@ -53,6 +53,11 @@
+ should normally be compiled as kernel modules. The modules perform
+ various checks and verifications when loaded.
+
++config MTD_ROOTFS_ROOT_DEV
++ bool "Automatically set 'rootfs' partition to be root filesystem"
++ depends on MTD_PARTITIONS
++ default y
++
+ config MTD_REDBOOT_PARTS
+ tristate "RedBoot partition table parsing"
+ depends on MTD_PARTITIONS
+diff -Nur linux-2.6.29.1.orig/drivers/mtd/mtdpart.c linux-2.6.29.1/drivers/mtd/mtdpart.c
+--- linux-2.6.29.1.orig/drivers/mtd/mtdpart.c 2009-04-02 22:55:27.000000000 +0200
++++ linux-2.6.29.1/drivers/mtd/mtdpart.c 2009-05-02 19:26:39.038093851 +0200
+@@ -18,6 +18,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/compatmac.h>
++#include <linux/root_dev.h>
+
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+@@ -37,7 +38,7 @@
+ * the pointer to that structure with this macro.
+ */
+ #define PART(x) ((struct mtd_part *)(x))
+-
++#define IS_PART(mtd) (mtd->read == part_read)
+
+ /*
+ * MTD methods which simply translate the effective address and pass through
+@@ -502,14 +503,23 @@
+ {
+ struct mtd_part *slave;
+ uint64_t cur_offset = 0;
+- int i;
++ int i, j, ret;
+
+ printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
+
+- for (i = 0; i < nbparts; i++) {
+- slave = add_one_partition(master, parts + i, i, cur_offset);
++ for (i = 0, j = 0; i < nbparts; i++) {
++ slave = add_one_partition(master, parts + i, j++, cur_offset);
+ if (!slave)
+ return -ENOMEM;
++ if (!strcmp(parts[i].name, "rootfs") && slave->registered) {
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++ if (ROOT_DEV == 0) {
++ printk(KERN_NOTICE "mtd: partition \"rootfs\" "
++ "set to be root filesystem\n");
++ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
++ }
++#endif
++ }
+ cur_offset = slave->offset + slave->mtd.size;
+ }
+
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index e573d922e..47b4f6df1 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -21,7 +21,6 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \
--disable-__cxa_atexit \
--enable-target-optspace \
--with-gnu-ld \
- --without-headers \
--disable-libmudflap \
--disable-libgomp \
--disable-biarch \
@@ -34,7 +33,7 @@ else
GCC_CONFOPTS+= --disable-libssp
endif
-ifeq ($(ADK_NO_FPU),y)
+ifeq ($(ADK_DEVICE_NO_FPU),y)
GCC_CONFOPTS+= --with-float=soft
endif
@@ -42,6 +41,10 @@ ifeq ($(ADK_LINUX_MIPS64),y)
GCC_CONFOPTS+= --with-abi=64
endif
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
+GCC_CONFOPTS+= --disable-tls
+endif
+
include ${TOPDIR}/mk/buildhlp.mk
GCC_BUILD_DIR1:= $(WRKBUILD)-initial
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-02 03:59:18 +0000