diff options
Diffstat (limited to 'target')
33 files changed, 914 insertions, 2138 deletions
diff --git a/target/Makefile b/target/Makefile index b8b92c960..562d2b86b 100644 --- a/target/Makefile +++ b/target/Makefile @@ -59,12 +59,22 @@ ifeq ($(ADK_NATIVE),y) if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi; \ fi else +ifeq ($(ADK_USE_KERNEL_MINICONFIG),y) + @if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \ + cat ${TOPDIR}/target/linux/kernel.config \ + ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \ + else \ + echo "no miniconfig found for target system"; \ + exit 1; \ + fi +else @if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \ cp ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \ else \ cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \ fi endif +endif @(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \ while IFS='=' read symbol value; do \ sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \ diff --git a/target/arm/kernel.config b/target/arm/kernel.config index 7a4266c04..e477fcfb8 100644 --- a/target/arm/kernel.config +++ b/target/arm/kernel.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.11.5 Kernel Configuration +# Linux/arm 3.11.10 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -332,9 +332,6 @@ CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 # CONFIG_ARM_APPENDED_DTB is not set CONFIG_CMDLINE="" -# CONFIG_CMDLINE_FROM_BOOTLOADER is not set -CONFIG_CMDLINE_EXTEND=y -# CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set @@ -810,7 +807,57 @@ CONFIG_TMPFS=y # CONFIG_CONFIGFS_FS is not set # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set -# CONFIG_NLS is not set +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set +# CONFIG_NLS_UTF8 is not set # # Kernel hacking diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000 new file mode 100644 index 000000000..d4ed74282 --- /dev/null +++ b/target/arm/sys-available/keyasic-ka2000 @@ -0,0 +1,16 @@ +config ADK_TARGET_SYSTEM_KEYASIC_KA2000 + bool "KeyASIC KA2000 (f.e. Transcend WifiSD)" + select ADK_arm + select ADK_little + select ADK_keyasic_ka2000 + select ADK_KERNEL_AEABI + select ADK_EABI + select ADK_CPU_ARMV5 + select ADK_TARGET_NO_FPU + select ADK_TOOLCHAIN + select ADK_STATIC + select BUSYBOX_STATIC + help + KeyASIC KA2000 aka Transcend WifiSD. + Build a toolchain only and make all binaries static. + diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 9d743ed18..3fa60178e 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -14,7 +14,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT select ADK_PACKAGE_BCM2835_FIRMWARE - select ADK_PACKAGE_BCM2835_VC select ADK_TARGET_KERNEL_ZIMAGE help Raspberry PI diff --git a/target/config/Config.in b/target/config/Config.in index f551e21a0..1e7afc323 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -20,7 +20,7 @@ config ADK_TARGET_KERNEL string default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE - default "simpleImage.system" if ADK_TARGET_KERNEL_LINUXBIN + default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE default "vmlinux" @@ -36,6 +36,11 @@ config ADK_TARGET_ENDIAN default "little" if ADK_little default "big" if ADK_big +config ADK_JFFS2_OPTS + string + default "-l" if ADK_little + default "-b" if ADK_big + config ADK_TOOLCHAIN boolean @@ -143,7 +148,25 @@ config ADK_TARGET_LIBC_PATH # submodel support -# + +config ADK_TARGET_KERNEL_MINICONFIG + string + default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + +choice +prompt "Qemu MICROBLAZE Emulation" +depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + +config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + boolean "Xilinx ml605" + select ADK_TARGET_WITH_MTD + +config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + boolean "Xilinx Spartan S3ADSP1800" + +endchoice + choice prompt "Qemu ARM Emulation" depends on ADK_TARGET_SYSTEM_QEMU_ARM @@ -501,8 +524,8 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686 - default "console=ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - default "console=ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE @@ -680,6 +703,14 @@ config ADK_TARGET_ROOTFS_SQUASHFS help highly compressed read-only filesystem for MTD flash systems. +config ADK_TARGET_ROOTFS_JFFS2 + bool "Compressed read-write root filesystem (jffs2)" + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_JFFS2 + depends on ADK_TARGET_WITH_MTD + help + compressed read-write filesystem for MTD flash systems. + config ADK_TARGET_ROOTFS_YAFFS bool "YAFFS2 root filesystem (NAND)" select ADK_KERNEL_MISC_FILESYSTEMS @@ -748,9 +779,21 @@ config ADK_TARGET_ROOTFS_MMC Use this option if you have a MMC/SDCARD based system. (ext2 filesystem is used.) +config ADK_TARGET_ROOTFS_ISO + bool "ISO image" + select ADK_KERNEL_ISO9660_FS + select ADK_KERNEL_JOLIET + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV_SR + depends on ADK_HOST_LINUX + depends on ADK_LINUX_X86 + help + Use this option to create a bootable ISO image. + config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU + depends on !ADK_LINUX_MICROBLAZE help Use this option if your root filesystem is ext2/ext3/ext4/xfs. diff --git a/target/linux/Config.in b/target/linux/Config.in index 79511489c..e4b81dd2f 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -18,7 +18,6 @@ source target/linux/config/Config.in.bluetooth source target/linux/config/Config.in.watchdog source target/linux/config/Config.in.leds source target/linux/config/Config.in.misc -source target/linux/config/Config.in.microblaze source target/linux/config/Config.in.mips source target/linux/config/Config.in.lib source target/linux/config/Config.in.pm diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index bbd9ce745..fb5bf080f 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI config ADK_KERNEL_BLK_DEV_SD boolean +config ADK_KERNEL_BLK_DEV_SR + boolean + config ADK_KERNEL_ISCSI_TCP boolean @@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD config ADK_KPACKAGE_KMOD_BLK_DEV_SR prompt "kmod-scsi-cdrom................... SCSI CDROM support" depends on !ADK_KERNEL_SCSI + depends on !ADK_KERNEL_BLK_DEV_SR depends on ADK_KPACKAGE_KMOD_SCSI tristate help diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 091cb98a4..773c518e8 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -1,6 +1,10 @@ config ADK_KERNEL_MTD + select ADK_KERNEL_GENERIC_IO boolean +config ADK_KERNEL_GENERIC_IO + boolean + config ADK_KERNEL_MTD_MTDRAM boolean @@ -41,6 +45,9 @@ config ADK_KERNEL_MTD_GEN_PROBE config ADK_KERNEL_MTD_PHYSMAP boolean +config ADK_KERNEL_MTD_PHYSMAP_OF + boolean + config ADK_KERNEL_MTD_CFI_ADV_OPTIONS boolean @@ -57,16 +64,31 @@ config ADK_KERNEL_MTD_AR7_PARTS config ADK_KERNEL_MTD_CFI_INTELEXT boolean default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE default n config ADK_KERNEL_MTD_CFI_AMDSTD boolean default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE default n config ADK_KERNEL_MTD_CFI_STAA boolean default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE + default n + +config ADK_KERNEL_MTD_OF_PARTS + boolean + default n + +config ADK_KERNEL_MTD_M25P80 + boolean + default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default n config ADK_KERNEL_MTD_AR2315 @@ -78,6 +100,7 @@ config ADK_KERNEL_MTD_AR2315 config ADK_TARGET_NAND boolean + select ADK_KERNEL_BLOCK select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_YAFFS_FS select ADK_KERNEL_YAFFS_YAFFS2 @@ -88,22 +111,31 @@ config ADK_TARGET_NAND select ADK_KERNEL_MTD_NAND_PLATFORM select ADK_KERNEL_MTD_CHAR select ADK_KERNEL_MTD_BLKDEVS - select ADK_KERNEL_BLOCK select ADK_KERNEL_MTD_BLOCK default y if ADK_TARGET_WITH_NAND default n config ADK_TARGET_MTD boolean + select ADK_KERNEL_BLOCK + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_JFFS2_FS select ADK_KERNEL_MTD select ADK_KERNEL_MTD_PARTITIONS select ADK_KERNEL_MTD_CHAR select ADK_KERNEL_MTD_BLKDEVS - select ADK_KERNEL_BLOCK select ADK_KERNEL_MTD_BLOCK select ADK_KERNEL_MTD_ROOTFS_ROOT_DEV select ADK_KERNEL_MTD_CFI select ADK_KERNEL_MTD_GEN_PROBE select ADK_KERNEL_MTD_PHYSMAP + select ADK_KERNEL_MTD_PHYSMAP_OF if ADK_LINUX_MICROBLAZE + select ADK_KERNEL_MTD_OF_PARTS if ADK_LINUX_MICROBLAZE default y if ADK_TARGET_WITH_MTD default n + +config ADK_TARGET_MTD_SIZE + int + default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE + default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default "0" diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index ab048805e..a764e7491 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -1,5 +1,8 @@ menu "Filesystems support" +config ADK_KERNEL_MISC_FILESYSTEMS + boolean + config ADK_KERNEL_FSNOTIFY boolean default y @@ -8,6 +11,9 @@ config ADK_KERNEL_EXPORTFS boolean default y +config ADK_KERNEL_JFFS2_FS + boolean + config ADK_KERNEL_YAFFS_FS tristate @@ -27,9 +33,6 @@ config ADK_KERNEL_YAFFS_CHECKPOINT_RESERVED_BLOCKS config ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM boolean -config ADK_KERNEL_MISC_FILESYSTEMS - boolean - config ADK_KERNEL_DNOTIFY boolean @@ -44,10 +47,15 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET string default "iso8859-1" +config ADK_KERNEL_SQUASHFS_XZ + boolean + default n + config ADK_KERNEL_SQUASHFS prompt "squashfs.......................... SquashFS filesystem" boolean select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_SQUASHFS_XZ default n config ADK_KERNEL_EXT2_FS @@ -172,7 +180,8 @@ config ADK_KPACKAGE_KMOD_VFAT_FS prompt "kmod-vfat-fs...................... VFAT filesystem support" tristate select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS - select ADK_KPACKAGE_KMOD_NLS_UTF8 + select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 + select ADK_KPACKAGE_KMOD_NLS_ISO8859_1 select ADK_KERNEL_BLOCK default y if ADK_TARGET_WITH_MMC default n @@ -227,7 +236,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS fuse-utils. config ADK_KERNEL_JOLIET - bool + boolean + default n + +config ADK_KERNEL_ISO9660_FS + boolean default n config ADK_KPACKAGE_KMOD_ISO9660_FS diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 75c05449f..af28b91d7 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -1,6 +1,5 @@ config ADK_KERNEL_VT boolean - default y if ADK_HARDWARE_QEMU default y if ADK_HARDWARE_VBOX default y if ADK_TARGET_WITH_VGA default y if ADK_NATIVE_SYSTEM_IBM_X40 @@ -9,7 +8,6 @@ config ADK_KERNEL_VT config ADK_KERNEL_VT_CONSOLE boolean - default y if ADK_HARDWARE_QEMU default y if ADK_HARDWARE_VBOX default y if ADK_TARGET_WITH_VGA default y if ADK_NATIVE_SYSTEM_IBM_X40 diff --git a/target/linux/config/Config.in.microblaze b/target/linux/config/Config.in.microblaze deleted file mode 100644 index 5a6764250..000000000 --- a/target/linux/config/Config.in.microblaze +++ /dev/null @@ -1,4 +0,0 @@ -config ADK_KERNEL_OPT_LIB_ASM - default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - default n - boolean diff --git a/target/linux/kernel.config b/target/linux/kernel.config new file mode 100644 index 000000000..8bf3aafe6 --- /dev/null +++ b/target/linux/kernel.config @@ -0,0 +1,41 @@ +CONFIG_DEFAULT_HOSTNAME="openadk" +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="" +CONFIG_MMU=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_INET=y +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_EMBEDDED=y +CONFIG_MODULES=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_NO_HZ=y +CONFIG_PRINTK=y +CONFIG_BUG=n +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y +CONFIG_TTY=y +CONFIG_UNIX98_PTYS=y +CONFIG_PRINTK_TIME=y +CONFIG_EARLY_PRINTK=y diff --git a/target/linux/patches/3.11.10/defaults.patch b/target/linux/patches/3.11.10/defaults.patch index 58aae610b..6cdca084e 100644 --- a/target/linux/patches/3.11.10/defaults.patch +++ b/target/linux/patches/3.11.10/defaults.patch @@ -20,3 +20,27 @@ diff -Nur linux-3.0.4.orig/fs/notify/Kconfig linux-3.0.4/fs/notify/Kconfig source "fs/notify/dnotify/Kconfig" source "fs/notify/inotify/Kconfig" +diff -Nur linux-3.11.10.orig/drivers/scsi/Kconfig linux-3.11.10/drivers/scsi/Kconfig +--- linux-3.11.10.orig/drivers/scsi/Kconfig 2013-11-29 19:42:37.000000000 +0100 ++++ linux-3.11.10/drivers/scsi/Kconfig 2013-12-27 19:13:21.000000000 +0100 +@@ -2,7 +2,7 @@ + + config SCSI_MOD + tristate +- default y if SCSI=n || SCSI=y ++ default y if SCSI=y + default m if SCSI=m + + config RAID_ATTRS +diff -Nur linux-3.11.10.orig/usr/Kconfig linux-3.11.10/usr/Kconfig +--- linux-3.11.10.orig/usr/Kconfig 2013-11-29 19:42:37.000000000 +0100 ++++ linux-3.11.10/usr/Kconfig 2013-12-27 19:15:16.000000000 +0100 +@@ -47,7 +47,7 @@ + + config RD_GZIP + bool "Support initial ramdisks compressed using gzip" if EXPERT +- default y ++ default n + depends on BLK_DEV_INITRD + select DECOMPRESS_GZIP + help diff --git a/target/linux/patches/3.11.10/microblaze-dts.patch b/target/linux/patches/3.11.10/microblaze-dts.patch deleted file mode 100644 index e73959a73..000000000 --- a/target/linux/patches/3.11.10/microblaze-dts.patch +++ /dev/null @@ -1,475 +0,0 @@ -diff -Nur linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts linux-3.11.10/arch/microblaze/platform/generic/system.dts ---- linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts 2013-11-29 19:42:37.000000000 +0100 -+++ linux-3.11.10/arch/microblaze/platform/generic/system.dts 2013-12-08 13:01:59.000000000 +0100 -@@ -1,102 +1,72 @@ --/* -- * Device Tree Generator version: 1.1 -- * -- * (C) Copyright 2007-2008 Xilinx, Inc. -- * (C) Copyright 2007-2009 Michal Simek -- * -- * Michal SIMEK <monstr@monstr.eu> -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of -- * the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -- * MA 02111-1307 USA -- * -- * CAUTION: This file is automatically generated by libgen. -- * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6 -- * -- * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101 -- */ -- - /dts-v1/; -+ - / { -- #address-cells = <1>; -- #size-cells = <1>; -+ #address-cells = <0x1>; -+ #size-cells = <0x1>; - compatible = "xlnx,microblaze"; -- hard-reset-gpios = <&LEDs_8Bit 2 1>; - model = "testing"; -- DDR2_SDRAM: memory@90000000 { -+ -+ memory@90000000 { - device_type = "memory"; -- reg = < 0x90000000 0x10000000 >; -- } ; -- aliases { -- ethernet0 = &Hard_Ethernet_MAC; -- serial0 = &RS232_Uart_1; -- } ; -+ reg = <0x90000000 0x8000000>; -+ }; -+ - chosen { -- bootargs = "console=ttyUL0,115200 highres=on"; -+ bootargs = "console=ttyUL0,115200"; - linux,stdout-path = "/plb@0/serial@84000000"; -- } ; -+ }; -+ - cpus { -- #address-cells = <1>; -+ #address-cells = <0x1>; - #cpus = <0x1>; -- #size-cells = <0>; -- microblaze_0: cpu@0 { -- clock-frequency = <125000000>; -+ #size-cells = <0x0>; -+ -+ cpu@0 { -+ clock-frequency = <0x3b9aca0>; - compatible = "xlnx,microblaze-7.10.d"; - d-cache-baseaddr = <0x90000000>; -- d-cache-highaddr = <0x9fffffff>; -+ d-cache-highaddr = <0x97ffffff>; - d-cache-line-size = <0x10>; -- d-cache-size = <0x2000>; -+ d-cache-size = <0x800>; - device_type = "cpu"; - i-cache-baseaddr = <0x90000000>; -- i-cache-highaddr = <0x9fffffff>; -+ i-cache-highaddr = <0x97ffffff>; - i-cache-line-size = <0x10>; -- i-cache-size = <0x2000>; -+ i-cache-size = <0x800>; - model = "microblaze,7.10.d"; -- reg = <0>; -- timebase-frequency = <125000000>; -- xlnx,addr-tag-bits = <0xf>; -+ reg = <0x0>; -+ timebase-frequency = <0x3b9aca0>; -+ xlnx,addr-tag-bits = <0x10>; - xlnx,allow-dcache-wr = <0x1>; - xlnx,allow-icache-wr = <0x1>; - xlnx,area-optimized = <0x0>; -- xlnx,cache-byte-size = <0x2000>; -+ xlnx,cache-byte-size = <0x800>; - xlnx,d-lmb = <0x1>; - xlnx,d-opb = <0x0>; - xlnx,d-plb = <0x1>; - xlnx,data-size = <0x20>; -- xlnx,dcache-addr-tag = <0xf>; -- xlnx,dcache-always-used = <0x1>; -- xlnx,dcache-byte-size = <0x2000>; -+ xlnx,dcache-addr-tag = <0x10>; -+ xlnx,dcache-always-used = <0x0>; -+ xlnx,dcache-byte-size = <0x800>; - xlnx,dcache-line-len = <0x4>; - xlnx,dcache-use-fsl = <0x1>; - xlnx,debug-enabled = <0x1>; -- xlnx,div-zero-exception = <0x1>; -+ xlnx,div-zero-exception = <0x0>; - xlnx,dopb-bus-exception = <0x0>; - xlnx,dynamic-bus-sizing = <0x1>; - xlnx,edge-is-positive = <0x1>; -- xlnx,family = "virtex5"; -- xlnx,endianness = <0x1>; -- xlnx,fpu-exception = <0x1>; -+ xlnx,family = "spartan3adsp"; -+ xlnx,fpu-exception = <0x0>; - xlnx,fsl-data-size = <0x20>; - xlnx,fsl-exception = <0x0>; - xlnx,fsl-links = <0x0>; - xlnx,i-lmb = <0x1>; - xlnx,i-opb = <0x0>; - xlnx,i-plb = <0x1>; -- xlnx,icache-always-used = <0x1>; -+ xlnx,icache-always-used = <0x0>; - xlnx,icache-line-len = <0x4>; - xlnx,icache-use-fsl = <0x1>; -- xlnx,ill-opcode-exception = <0x1>; -+ xlnx,ill-opcode-exception = <0x0>; - xlnx,instance = "microblaze_0"; - xlnx,interconnect = <0x1>; - xlnx,interrupt-is-edge = <0x0>; -@@ -105,11 +75,11 @@ - xlnx,mmu-itlb-size = <0x2>; - xlnx,mmu-tlb-access = <0x3>; - xlnx,mmu-zones = <0x10>; -- xlnx,number-of-pc-brk = <0x1>; -- xlnx,number-of-rd-addr-brk = <0x0>; -- xlnx,number-of-wr-addr-brk = <0x0>; -- xlnx,opcode-0x0-illegal = <0x1>; -- xlnx,pvr = <0x2>; -+ xlnx,number-of-pc-brk = <0x3>; -+ xlnx,number-of-rd-addr-brk = <0x2>; -+ xlnx,number-of-wr-addr-brk = <0x2>; -+ xlnx,opcode-0x0-illegal = <0x0>; -+ xlnx,pvr = <0x1>; - xlnx,pvr-user1 = <0x0>; - xlnx,pvr-user2 = <0x0>; - xlnx,reset-msr = <0x0>; -@@ -117,29 +87,44 @@ - xlnx,unaligned-exceptions = <0x1>; - xlnx,use-barrel = <0x1>; - xlnx,use-dcache = <0x1>; -- xlnx,use-div = <0x1>; -+ xlnx,use-div = <0x0>; - xlnx,use-ext-brk = <0x1>; - xlnx,use-ext-nm-brk = <0x1>; - xlnx,use-extended-fsl-instr = <0x0>; -- xlnx,use-fpu = <0x2>; -- xlnx,use-hw-mul = <0x2>; -+ xlnx,use-fpu = <0x0>; -+ xlnx,use-hw-mul = <0x1>; - xlnx,use-icache = <0x1>; - xlnx,use-interrupt = <0x1>; - xlnx,use-mmu = <0x3>; - xlnx,use-msr-instr = <0x1>; - xlnx,use-pcmp-instr = <0x1>; -- } ; -- } ; -- mb_plb: plb@0 { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus"; -- ranges ; -- FLASH: flash@a0000000 { -- bank-width = <2>; -+ }; -+ }; -+ -+ plb@0 { -+ #address-cells = <0x1>; -+ #size-cells = <0x1>; -+ compatible = "xlnx,plb-v46-1.03.a", "simple-bus"; -+ ranges; -+ -+ ethernet@81000000 { -+ compatible = "xlnx,xps-ethernetlite-2.00.b"; -+ device_type = "network"; -+ interrupt-parent = <0x1>; -+ interrupts = <0x1 0x0>; -+ local-mac-address = [02 00 00 00 00 00]; -+ reg = <0x81000000 0x10000>; -+ xlnx,duplex = <0x1>; -+ xlnx,family = "spartan3adsp"; -+ xlnx,rx-ping-pong = <0x0>; -+ xlnx,tx-ping-pong = <0x0>; -+ }; -+ -+ flash@a0000000 { -+ bank-width = <0x1>; - compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash"; -- reg = < 0xa0000000 0x2000000 >; -- xlnx,family = "virtex5"; -+ reg = <0xa0000000 0x1000000>; -+ xlnx,family = "spartan3adsp"; - xlnx,include-datawidth-matching-0 = <0x1>; - xlnx,include-datawidth-matching-1 = <0x0>; - xlnx,include-datawidth-matching-2 = <0x0>; -@@ -147,9 +132,9 @@ - xlnx,include-negedge-ioregs = <0x0>; - xlnx,include-plb-ipif = <0x1>; - xlnx,include-wrbuf = <0x1>; -- xlnx,max-mem-width = <0x10>; -+ xlnx,max-mem-width = <0x8>; - xlnx,mch-native-dwidth = <0x20>; -- xlnx,mch-plb-clk-period-ps = <0x1f40>; -+ xlnx,mch-plb-clk-period-ps = <0x3e80>; - xlnx,mch-splb-awidth = <0x20>; - xlnx,mch0-accessbuf-depth = <0x10>; - xlnx,mch0-protocol = <0x0>; -@@ -163,7 +148,7 @@ - xlnx,mch3-accessbuf-depth = <0x10>; - xlnx,mch3-protocol = <0x0>; - xlnx,mch3-rddatabuf-depth = <0x10>; -- xlnx,mem0-width = <0x10>; -+ xlnx,mem0-width = <0x8>; - xlnx,mem1-width = <0x20>; - xlnx,mem2-width = <0x20>; - xlnx,mem3-width = <0x20>; -@@ -178,31 +163,31 @@ - xlnx,synch-pipedelay-1 = <0x2>; - xlnx,synch-pipedelay-2 = <0x2>; - xlnx,synch-pipedelay-3 = <0x2>; -- xlnx,tavdv-ps-mem-0 = <0x1adb0>; -+ xlnx,tavdv-ps-mem-0 = <0x11170>; - xlnx,tavdv-ps-mem-1 = <0x3a98>; - xlnx,tavdv-ps-mem-2 = <0x3a98>; - xlnx,tavdv-ps-mem-3 = <0x3a98>; -- xlnx,tcedv-ps-mem-0 = <0x1adb0>; -+ xlnx,tcedv-ps-mem-0 = <0x11170>; - xlnx,tcedv-ps-mem-1 = <0x3a98>; - xlnx,tcedv-ps-mem-2 = <0x3a98>; - xlnx,tcedv-ps-mem-3 = <0x3a98>; -- xlnx,thzce-ps-mem-0 = <0x88b8>; -+ xlnx,thzce-ps-mem-0 = <0x61a8>; - xlnx,thzce-ps-mem-1 = <0x1b58>; - xlnx,thzce-ps-mem-2 = <0x1b58>; - xlnx,thzce-ps-mem-3 = <0x1b58>; -- xlnx,thzoe-ps-mem-0 = <0x1b58>; -+ xlnx,thzoe-ps-mem-0 = <0x61a8>; - xlnx,thzoe-ps-mem-1 = <0x1b58>; - xlnx,thzoe-ps-mem-2 = <0x1b58>; |