diff options
Diffstat (limited to 'target/avr32')
| -rw-r--r-- | target/avr32/Makefile | 5 | ||||
| -rw-r--r-- | target/avr32/patches/4.4.302/revert-futex.patch | 22 | ||||
| -rw-r--r-- | target/avr32/systems/atmel-ngw100 | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/target/avr32/Makefile b/target/avr32/Makefile index 1f055993d..75ec3679a 100644 --- a/target/avr32/Makefile +++ b/target/avr32/Makefile @@ -11,6 +11,11 @@ KERNEL:=$(LINUX_DIR)/arch/avr32/boot/images/uImage ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "Use following command to install it on SD card:" + @echo "sudo ./scripts/install.sh $(ADK_TARGET_SYSTEM) /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "U-Boot commands:" + @echo "set bootargs 'console=ttyS0 root=/dev/mmcblk0p1 ro rootwait'" + @echo "ext2load mmc 0:1 0x10300000 /boot/kernel; bootm 0x10300000" endif ifeq ($(ADK_TARGET_FS),nfsroot) targethelp: diff --git a/target/avr32/patches/4.4.302/revert-futex.patch b/target/avr32/patches/4.4.302/revert-futex.patch new file mode 100644 index 000000000..dd0e5c23a --- /dev/null +++ b/target/avr32/patches/4.4.302/revert-futex.patch @@ -0,0 +1,22 @@ +diff -Nur linux-4.4.302.orig/kernel/futex.c linux-4.4.302/kernel/futex.c +--- linux-4.4.302.orig/kernel/futex.c 2022-02-03 09:27:54.000000000 +0100 ++++ linux-4.4.302/kernel/futex.c 2023-02-19 14:03:07.727035123 +0100 +@@ -1701,16 +1701,8 @@ + int oldval, ret; + + if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) { +- if (oparg < 0 || oparg > 31) { +- char comm[sizeof(current->comm)]; +- /* +- * kill this print and return -EINVAL when userspace +- * is sane again +- */ +- pr_info_ratelimited("futex_wake_op: %s tries to shift op by %d; fix this program\n", +- get_task_comm(comm, current), oparg); +- oparg &= 31; +- } ++ if (oparg < 0 || oparg > 31) ++ return -EINVAL; + oparg = 1 << oparg; + } + diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100 index 3c5808d90..28f06acf9 100644 --- a/target/avr32/systems/atmel-ngw100 +++ b/target/avr32/systems/atmel-ngw100 @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_ATMEL_NGW100 select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK + select ADK_TARGET_WITH_SD select ADK_TARGET_KERNEL_UIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION select ADK_HOST_BUILD_U_BOOT |