diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.compiler | 2 | ||||
| -rw-r--r-- | target/config/Config.in.kernelcfg | 2 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 1 | ||||
| -rw-r--r-- | target/linux/kernel.config | 1 | ||||
| -rw-r--r-- | target/linux/patches/3.10-nds32/nfsroot-cmdline.patch | 30 | ||||
| -rw-r--r-- | target/nds32/kernel/andes-ag101p | 4 |
9 files changed, 43 insertions, 7 deletions
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 6d37de7a0..c9b5f3443 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -56,7 +56,7 @@ config ADK_TOOLCHAIN_GCC_OR1K depends on ADK_TARGET_ARCH_OR1K config ADK_TOOLCHAIN_GCC_NDS32 - bool "4.9.3-nds32" + bool "4.9.4-nds32" depends on ADK_TARGET_ARCH_NDS32 config ADK_TOOLCHAIN_GCC_ARC diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg index 464bd173d..5d0742876 100644 --- a/target/config/Config.in.kernelcfg +++ b/target/config/Config.in.kernelcfg @@ -34,7 +34,7 @@ config ADK_TARGET_KERNEL_DEFCONFIG default "nsim_700_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV1 default "nsim_hs_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV2 default "10m50_defconfig" if ADK_TARGET_SYSTEM_QEMU_NIOS2 - default "orca_defconfig" if ADK_TARGET_SYSTEM_ANDES_AG101P + default "ag101p_defconfig" if ADK_TARGET_SYSTEM_ANDES_AG101P default "bb.org_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "am335x_phytec_defconfig" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "j2_defconfig" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index 1a77c3db2..49d5606a4 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -157,8 +157,8 @@ config ADK_TARGET_KERNEL_VERSION_3_4 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 -config ADK_TARGET_KERNEL_VERSION_3_4_NDS32 - bool "3.4-nds32" +config ADK_TARGET_KERNEL_VERSION_3_10_NDS32 + bool "3.10-nds32" depends on ADK_TARGET_ARCH_NDS32 select ADK_TARGET_KERNEL_NO_MIRROR diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 758abeaa3..322b9172e 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -3,6 +3,11 @@ config ADK_KERNEL_BLOCK bool + select ADK_KERNEL_AIO + select ADK_KERNEL_INOTIFY_USER + +config ADK_KERNEL_AIO + bool menu "Block devices support" depends on ADK_TARGET_WITH_BLOCK \ diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 36422c1e9..956a0fb21 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -16,7 +16,6 @@ config ADK_KERNEL_FSNOTIFY config ADK_KERNEL_INOTIFY_USER bool - default y config ADK_KERNEL_AUTOFS4_FS bool diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 6f3510879..d8546b041 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -92,6 +92,7 @@ config ADK_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_NIOS2 \ || ADK_TARGET_SYSTEM_QEMU_OR1K \ + || ADK_TARGET_SYSTEM_ANDES_AG101P \ || ADK_TARGET_SYSTEM_ORANGE_PI0 \ || ADK_TARGET_SYSTEM_SOM_C6745 select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 7be2f40ed..8d7f9fda2 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -18,7 +18,6 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_AIO=y CONFIG_TTY=y CONFIG_UNIX98_PTYS=y CONFIG_DEVMEM=y diff --git a/target/linux/patches/3.10-nds32/nfsroot-cmdline.patch b/target/linux/patches/3.10-nds32/nfsroot-cmdline.patch new file mode 100644 index 000000000..b6982c8d2 --- /dev/null +++ b/target/linux/patches/3.10-nds32/nfsroot-cmdline.patch @@ -0,0 +1,30 @@ +diff -Nur linux-3.10-nds32.orig/arch/nds32/boot/dts/ag101p.dts linux-3.10-nds32/arch/nds32/boot/dts/ag101p.dts +--- linux-3.10-nds32.orig/arch/nds32/boot/dts/ag101p.dts 2017-07-31 07:41:18.000000000 +0200 ++++ linux-3.10-nds32/arch/nds32/boot/dts/ag101p.dts 2017-10-03 09:56:16.654394267 +0200 +@@ -7,7 +7,7 @@ + + chosen { + /* bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug bootmem_debug memblock=debug loglevel=7"; */ +- bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug loglevel=7"; ++ bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug loglevel=7 rw root=/dev/nfs ip=dhcp"; + }; + + memory@0 { +diff -Nur linux-3.10-nds32.orig/include/linux/etherdevice.h linux-3.10-nds32/include/linux/etherdevice.h +--- linux-3.10-nds32.orig/include/linux/etherdevice.h 2016-09-06 11:38:23.000000000 +0200 ++++ linux-3.10-nds32/include/linux/etherdevice.h 2017-10-06 07:28:40.004142545 +0200 +@@ -154,7 +154,13 @@ + */ + static inline void eth_random_addr(u8 *addr) + { +- get_random_bytes(addr, ETH_ALEN); ++ //get_random_bytes(addr, ETH_ALEN); ++ addr[0] = 0xB8; ++ addr[1] = 0x27; ++ addr[2] = 0xEB; ++ addr[3] = 0x91; ++ addr[4] = 0x8F; ++ addr[5] = 0xAA; + addr[0] &= 0xfe; /* clear multicast bit */ + addr[0] |= 0x02; /* set local assignment bit (IEEE802) */ + } diff --git a/target/nds32/kernel/andes-ag101p b/target/nds32/kernel/andes-ag101p index 2f9a5e3c8..aff07e3dc 100644 --- a/target/nds32/kernel/andes-ag101p +++ b/target/nds32/kernel/andes-ag101p @@ -1,5 +1,7 @@ CONFIG_NDS32=y +CONFIG_NDS32_BUILTIN_DTB="ag101p" CONFIG_PLATFORM_AHBDMA=y CONFIG_PLATFORM_APBDMA=y +CONFIG_NDS32_INTC=y +CONFIG_IVIC_INTC=y CONFIG_UART_CLK=14745600 -CONFIG_DEBUG_USER=y |