diff options
Diffstat (limited to 'target')
168 files changed, 3072 insertions, 220 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index a2bd23a8b..f781bdd27 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -59,13 +59,13 @@ endif @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @echo "Use following command to install it on SD card:" - @echo "sudo ./scripts/install-rpi.sh /dev/sdb $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "sudo ./scripts/install-rpi.sh /dev/sdx $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" @echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img' endif diff --git a/target/arm/cubox-i/patches/3.10.33/solidrun-cubox-i.patch b/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch index beaa71b4e..beaa71b4e 100644 --- a/target/arm/cubox-i/patches/3.10.33/solidrun-cubox-i.patch +++ b/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 29a82ccf6..ec76019d4 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -7,6 +7,7 @@ CONFIG_PLAT_VERSATILE_CLCD=y CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y CONFIG_ARM_TIMER_SP804=y +CONFIG_KUSER_HELPERS=y CONFIG_CPU_ARM926T=y CONFIG_CPU_32v5=y CONFIG_ARM_AMBA=y diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index 7415e31b4..b89b87337 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -6,6 +6,7 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_DCSCB=y CONFIG_ARCH_VEXPRESS_TC2_PM=y +CONFIG_KUSER_HELPERS=y CONFIG_ARM_AMBA=y CONFIG_AEABI=y CONFIG_ATAGS=y diff --git a/target/arm/raspberry-pi/patches/3.10.33/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch index 2c313a843..2c313a843 100644 --- a/target/arm/raspberry-pi/patches/3.10.33/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20 index f3aded1d6..ac2ec191c 100644 --- a/target/arm/sys-available/acmesystems-foxg20 +++ b/target/arm/sys-available/acmesystems-foxg20 @@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_acmesystems_foxg20 select ADK_KERNEL_AEABI select ADK_TARGET_WITH_WATCHDOG - select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_USB select ADK_TARGET_KERNEL_IMAGE diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i index 97a9a84b4..3b96514c8 100644 --- a/target/arm/sys-available/cubox-i +++ b/target/arm/sys-available/cubox-i @@ -7,11 +7,11 @@ config ADK_TARGET_SYSTEM_CUBOX_I select ADK_fpu_neon select ADK_cubox_i select ADK_CPU_CORTEX_A9 - select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT select ADK_TARGET_KERNEL_ZIMAGE + select ADK_TARGET_WITH_ROOT_RW select ADK_PACKAGE_U_BOOT_CUBOX_I help Cubox-i diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm index aeaa41d44..1fa057c4b 100644 --- a/target/arm/sys-available/qemu-arm +++ b/target/arm/sys-available/qemu-arm @@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM select ADK_qemu_arm select ADK_little select ADK_soft_float - select ADK_fpu_vfp select ADK_eabi select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index e91e0e4a1..319df3523 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -7,11 +7,11 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_fpu_vfp select ADK_raspberry_pi select ADK_CPU_ARM1176JZF_S - select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT select ADK_PACKAGE_BCM2835_BOOTLOADER + select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_ZIMAGE help Raspberry PI diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 3ad081933..b9ba30aa5 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -7,7 +7,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_fpu_vfp select ADK_eabi select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ select ADK_CPU_CORTEX_A9 help ARM toolchain (soft float) for Cortex A9. diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf index 8a2db49a8..252a41aa2 100644 --- a/target/arm/sys-available/toolchain-armhf +++ b/target/arm/sys-available/toolchain-armhf @@ -7,7 +7,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF select ADK_fpu_vfp select ADK_toolchain_armhf select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ select ADK_CPU_CORTEX_A9 help ARM toolchain (hard float) for Cortex A9. diff --git a/target/arm/target.mk b/target/arm/target.mk index 677e112f7..87db1e279 100644 --- a/target/arm/target.mk +++ b/target/arm/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= arm CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/config/Config.in b/target/config/Config.in index 05f495449..d7bf385a2 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -139,7 +139,7 @@ config ADK_TARGET_MIPS_ABI choice prompt "Target ABI" -depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN +depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU config ADK_TARGET_ABI_N32 boolean "N32 ABI (new)" @@ -157,7 +157,7 @@ endchoice choice prompt "Target ABI" -depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN +depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU config ADK_TARGET_ABI_64 boolean "64 Bit ABI" @@ -175,6 +175,7 @@ endchoice config ADK_TARGET_LIBC_PATH string + default "lib" if ADK_32 default "lib32" if ADK_n32 default "libx32" if ADK_x32 default "lib64" if ADK_n64 \ @@ -193,37 +194,54 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ default "qemu-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS default "qemu-mipsel" if ADK_TARGET_SYSTEM_QEMU_MIPSEL - default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64 - default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL + default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_MIPS64N32 || ADK_TARGET_SYSTEM_QEMU_MIPS64N64 + default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL || ADK_TARGET_SYSTEM_QEMU_MIPS64ELN32 || ADK_TARGET_SYSTEM_QEMU_MIPS64ELN64 default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64 default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4 default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4EB default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 - default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 - default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 + default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_I486 + default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32 default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC config ADK_QEMU_ARGS string default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC +menu "Qemu configuration" +depends on ADK_HARDWARE_QEMU + +choice +prompt "Use a Bootloader" +depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86 + +config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER + boolean "do not use bootloader" + +config ADK_TARGET_QEMU_WITH_BOOTLOADER + boolean "use bootloader" + select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86 + +endchoice + 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" - config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 boolean "Xilinx Spartan S3ADSP1800" +config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + boolean "Xilinx ml605" + endchoice choice @@ -254,6 +272,8 @@ choice prompt "Qemu Emulation with permanent storage device (disk/flash)" depends on ADK_HARDWARE_QEMU default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_ARCHIVE +default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS +default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2 config ADK_TARGET_QEMU_WITHOUT_BLOCK boolean "disabled" @@ -261,8 +281,8 @@ config ADK_TARGET_QEMU_WITHOUT_BLOCK config ADK_TARGET_QEMU_WITH_BLOCK boolean "enabled" select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_LINUX_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC @@ -285,15 +305,15 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC select ADK_KERNEL_FONT_8x16 select ADK_KERNEL_FB select ADK_KERNEL_FRAMEBUFFER_CONSOLE - select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB - select ADK_KERNEL_FB_CIRRUS if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_KERNEL_FB_SM501 if ADK_LINUX_SH + select ADK_KERNEL_FB_CIRRUS if ADK_LINUX_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_FB_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ select ADK_KERNEL_INPUT select ADK_KERNEL_INPUT_KEYBOARD - select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_KERNEL_KEYBOARD_ATKBD if ADK_LINUX_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_INPUT_MOUSE select ADK_KERNEL_INPUT_MOUSEDEV - select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB + select ADK_KERNEL_USB_HID if ADK_LINUX_SH endchoice @@ -317,6 +337,7 @@ config ADK_TARGET_QEMU_WITH_VIRTIO endchoice +endmenu choice prompt "Use ARM thumb mode" @@ -355,12 +376,6 @@ config ADK_TARGET_WITH_ACPI config ADK_TARGET_WITH_VGA boolean -config ADK_TARGET_WITH_CF - boolean - -config ADK_TARGET_WITH_MMC - boolean - config ADK_TARGET_WITH_NAND boolean @@ -657,7 +672,8 @@ config ADK_TARGET_LIB_UCLIBC !ADK_LINUX_MICROBLAZE && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ - !ADK_TARGET_ABI_X32 + !ADK_x32 && \ + !ADK_32 help http://uclibc.org @@ -747,7 +763,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS depends on !ADK_HARDWARE_VBOX depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_KERNEL_BLK_DEV_INITRD - select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K help create an read-only initramfs system. @@ -774,15 +789,17 @@ config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" select ADK_KERNEL_SQUASHFS select ADK_HOST_NEED_SQUASHFS + select ADK_HOST_NEED_QEMU if ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_TARGET_WITH_MTD 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 - select ADK_HOST_NEED_JFFS2 + select ADK_KERNEL_JFFS2_FS + select ADK_HOST_NEED_MTD_UTILS + select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_TARGET_WITH_MTD help compressed read-write filesystem for MTD flash systems. @@ -827,43 +844,15 @@ config ADK_TARGET_ROOTFS_USB help Boot system from USB stick. -config ADK_TARGET_ROOTFS_CF - bool "read-write filesystem for compact flash" - depends on ADK_TARGET_WITH_CF - select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_SCSI - help - Use this option if you have a compact flash based system. - (ext2 filesystem is used.) - -config ADK_TARGET_ROOTFS_GENEXT2FS - bool "read-write filesystem for compact flash (genext2fs version)" - depends on ADK_TARGET_WITH_CF - select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_SCSI - select ADK_HOST_NEED_GENEXT2FS - help - Use this option if you have a compact flash based system. - (ext2 filesystem is used.) - -config ADK_TARGET_ROOTFS_MMC - bool "read-write filesystem for mmc/sdcard" - depends on ADK_TARGET_WITH_MMC - select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_SCSI - depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - help - 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 - select ADK_HOST_NEED_MKISOFS + select ADK_HOST_NEED_CDRTOOLS select ADK_HOST_NEED_SYSLINUX + select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_HOST_LINUX depends on ADK_LINUX_X86 help @@ -872,7 +861,7 @@ config ADK_TARGET_ROOTFS_ISO config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE bool "Archive usable for initramfs creation" help - Use this option if your palnning to create a initramfs, + Use this option if your planning to create a initramfs, useful for adk-test-framework. config ADK_TARGET_ROOTFS_ARCHIVE @@ -939,11 +928,12 @@ config ADK_TARGET_ROOTFS config ADK_PACKAGE_SUFFIX string default "ipk" if ADK_TARGET_PACKAGE_IPKG - default "tar.gz" if ADK_TARGET_PACKAGE_TGZ + default "tar.xz" if ADK_TARGET_PACKAGE_TXZ help choice prompt "Target package format" +default ADK_TARGET_PACKAGE_TXZ if ADK_PKG_TEST default ADK_TARGET_PACKAGE_IPKG depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH @@ -954,9 +944,9 @@ config ADK_TARGET_PACKAGE_IPKG help Create ipkg packages and use ipkg package management on the target. -config ADK_TARGET_PACKAGE_TGZ +config ADK_TARGET_PACKAGE_TXZ boolean - prompt "tar archive" + prompt "xz compressed tar archive" help Create compressed tar archives of packages. Pre- and post install scripts will be executed in the target diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 27b72941e..7487ac056 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -19,6 +19,13 @@ config ADK_DL_DIR Configure the download directory for all source packages. Use an absolute path. +config ADK_TARGET_CFLAGS_OPT + string "optimization flags for compiler" + default "-Os -pipe" + help + Compilation is only verfied with optimization for code size (Os). + Other stuff (O2) might break. Will not be used when ADK_DEBUG is on. + config ADK_DEBUG bool "Compile applications with debug support by default" default n @@ -26,6 +33,13 @@ config ADK_DEBUG All packages and libc will be compiled and packaged with debug information. Mostly useful for NFS root or big USB/CF or hard disk setups. +config ADK_DEBUG_OPTS + bool "use optimization cflags" + depends on ADK_DEBUG + default n + help + All packages and libc will be compiled with debug information and optimization flags on. + config ADK_DEBUG_STRIP bool "strip target binaries/libraries for gdbserver usage" depends on ADK_DEBUG diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 721f623de..ea023d0df 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -7,6 +7,14 @@ config ADK_RUNTIME_HOSTNAME help Set your target hostname. +config ADK_RUNTIME_START_SERVICES + prompt "start some services by default" + boolean + default n + help + +source "target/config/Config.in.scripts" + config ADK_RUNTIME_SSH_PUBKEY string "SSH public key (root user only)" default "" @@ -38,6 +46,7 @@ config ADK_RUNTIME_TIMEZONE choice prompt "Start getty or shell after bootup" +default ADK_RUNTIME_SHELL if ADK_PKG_TEST default ADK_RUNTIME_GETTY config ADK_RUNTIME_GETTY @@ -59,6 +68,7 @@ config ADK_RUNTIME_GETTY_VGA default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n help Start getty on VGA console. (tty1-tty6) @@ -69,6 +79,7 @@ config ADK_RUNTIME_GETTY_SERIAL default n if ADK_TARGET_SYSTEM_RASPBERRY_PI default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n if ADK_TARGET_SYSTEM_IBM_X40 + default n if ADK_TARGET_SYSTEM_ARANYM_M68K default y help Start getty on serial console. @@ -80,7 +91,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I - default "nfcon0" if ADK_TARGET_SYSTEM_ARANYM_M68K default "ttyS0" config ADK_RUNTIME_CONSOLE_SERIAL_SPEED diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 7e37f5ec1..b3e900bb3 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -1,16 +1,67 @@ -config ADK_HOST_NEED_MKISOFS +# always required from OpenADK +config ADK_HOST_BUILD_HEIRLOOM_CPIO + boolean + default y + +config ADK_HOST_BUILD_ADK_HELPER + boolean + default y + +# always required, but can be provided by host +config ADK_HOST_BUILD_BASH boolean default n -config ADK_HOST_NEED_SYSLINUX +config ADK_HOST_BUILD_BC boolean default n -config ADK_HOST_NEED_SQUASHFS +config ADK_HOST_BUILD_BISON + boolean + default n + +config ADK_HOST_BUILD_BZIP2 + boolean + default n + +config ADK_HOST_BUILD_FILE + boolean + default n + +config ADK_HOST_BUILD_FINDUTILS + boolean + default n + +config ADK_HOST_BUILD_FLEX + boolean + default n + +config ADK_HOST_BUILD_M4 + boolean + default n + +config ADK_HOST_BUILD_PKGCONF + boolean + default n + +config ADK_HOST_BUILD_XZ + boolean + default n + +# optional, but can be provided by host +config ADK_HOST_NEED_CCACHE + boolean + default n + +config ADK_HOST_BUILD_CCACHE + boolean + default n + +config ADK_HOST_NEED_CDRTOOLS boolean default n -config ADK_HOST_NEED_JFFS2 +config ADK_HOST_BUILD_CDRTOOLS boolean default n @@ -18,7 +69,7 @@ config ADK_HOST_NEED_GENEXT2FS boolean default n -config ADK_HOST_NEED_LZOP +config ADK_HOST_BUILD_GENEXT2FS boolean default n @@ -26,19 +77,74 @@ config ADK_HOST_NEED_LZMA boolean default n -config ADK_HOST_NEED_BZIP2 +config ADK_HOST_BUILD_LZMA boolean default n -config ADK_HOST_NEED_XZ +config ADK_HOST_NEED_LZOP boolean default n -config ADK_HOST_NEED_CCACHE +config ADK_HOST_BUILD_LZOP boolean default n -config ADK_HOST_NEED_PCRE +config ADK_HOST_NEED_MKSH + boolean + default n + +config ADK_HOST_BUILD_MKSH + boolean + default n + +config ADK_HOST_NEED_QEMU + boolean + default n + +config ADK_HOST_BUILD_QEMU + boolean + default n + +# optional, must be used from OpenADK +config ADK_HOST_NEED_MKIMAGE + boolean + default n + +config ADK_HOST_BUILD_MKIMAGE + boolean + default y if ADK_HOST_NEED_MKIMAGE + default n + +config ADK_HOST_NEED_MTD_UTILS + boolean + default n + +config ADK_HOST_BUILD_MTD_UTILS + boolean + default y if ADK_HOST_NEED_MTD_UTILS + default n + +config ADK_HOST_NEED_SQUASHFS + boolean + default n + +config ADK_HOST_BUILD_SQUASHFS + boolean + default y if ADK_HOST_NEED_SQUASHFS + default n + +config ADK_HOST_NEED_SYSLINUX + boolean + default n + +config ADK_HOST_BUILD_SYSLINUX + boolean + default y if ADK_HOST_NEED_SYSLINUX + default n + +config ADK_HOST_BUILD_PCRE boolean default y if ADK_HOST_DARWIN default n + +source "target/config/Config.in.prereq" diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index a1a5077e6..f87a7e751 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -124,7 +124,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM select ADK_KPACKAGE_KMOD_SND_SOC - select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE + select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_34 select ADK_KPACKAGE_KMOD_SND_COMPRESS depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index dd7c96dc5..9f1328809 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -106,6 +106,7 @@ config ADK_KERNEL_SCSI_SUNESP config ADK_KERNEL_PATA_MACIO select ADK_KERNEL_SCSI select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_SFF select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD @@ -114,6 +115,7 @@ config ADK_KERNEL_PATA_MACIO config ADK_KERNEL_PATA_PLATFORM select ADK_KERNEL_SCSI select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_SFF select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 019c439d8..a1c7ae6c9 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -34,7 +34,7 @@ config ADK_KERNEL_PRINTK boolean select ADK_KERNEL_EARLY_PRINTK default y - #depends on !ADK_PKG_TEST + depends on !ADK_PKG_TEST help Disable printk to save space and quieten bootup. diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index d8f4faf0f..d35f1c866 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -87,7 +87,6 @@ config ADK_KERNEL_MTD_OF_PARTS default n config ADK_KERNEL_MTD_M25P80 - select ADK_KERNEL_BLOCK select ADK_KERNEL_MTD select ADK_KERNEL_MTD_PARTITIONS select ADK_KERNEL_MTD_CHAR @@ -99,6 +98,8 @@ config ADK_KERNEL_MTD_M25P80 select ADK_KERNEL_MTD_PHYSMAP select ADK_KERNEL_MTD_PHYSMAP_OF select ADK_KERNEL_MTD_OF_PARTS + select ADK_KERNEL_SPI + select ADK_KERNEL_SPI_MASTER boolean default n @@ -111,7 +112,6 @@ 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 @@ -128,7 +128,6 @@ config ADK_TARGET_NAND config ADK_TARGET_MTD boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_JFFS2_FS select ADK_KERNEL_MTD @@ -145,6 +144,6 @@ config ADK_TARGET_MTD config ADK_TARGET_MTD_SIZE int - default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL + default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default "33554432" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default "0" diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 377122dc5..69af555c8 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -11,9 +11,6 @@ config ADK_KERNEL_EXPORTFS boolean default y -config ADK_KERNEL_JFFS2_FS - boolean - config ADK_KERNEL_YAFFS_FS tristate @@ -51,6 +48,21 @@ config ADK_KERNEL_SQUASHFS_XZ boolean default n +config ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS + boolean + default n + +config ADK_KERNEL_JFFS2_ZLIB + boolean + default n + +config ADK_KERNEL_JFFS2_FS + prompt "jffs2............................. JFFS2 filesystem" + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS + select ADK_KERNEL_JFFS2_ZLIB + boolean + config ADK_KERNEL_SQUASHFS prompt "squashfs.......................... SquashFS filesystem" boolean @@ -60,8 +72,6 @@ config ADK_KERNEL_SQUASHFS config ADK_KERNEL_EXT2_FS boolean - default y if ADK_TARGET_WITH_CF - default y if ADK_TARGET_WITH_MMC && !ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n @@ -70,7 +80,6 @@ config ADK_KPACKAGE_KMOD_EXT2_FS tristate default n depends on !ADK_KERNEL_EXT2_FS - select ADK_KERNEL_BLOCK help Ext2 is a standard Linux file system for hard disks. @@ -88,7 +97,6 @@ config ADK_KPACKAGE_KMOD_EXT3_FS tristate select ADK_KPACKAGE_KMOD_FS_MBCACHE if !ADK_KERNEL_EXT4_FS depends on !ADK_KERNEL_EXT3_FS - select ADK_KERNEL_BLOCK default n help This is the journalling version of the Second extended file system @@ -126,7 +134,6 @@ config ADK_KPACKAGE_KMOD_EXT4_FS select ADK_KPACKAGE_KMOD_FS_MBCACHE select ADK_KPACKAGE_KMOD_CRC16 depends on !ADK_KERNEL_EXT4_FS - select ADK_KERNEL_BLOCK default n help Ext4 filesystem. @@ -137,7 +144,6 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KPACKAGE_KMOD_NLS_UTF8 select ADK_KERNEL_MISC_FILESYSTEMS - select ADK_KERNEL_BLOCK default n help If you say Y here, you will be able to mount extended format @@ -152,7 +158,6 @@ config ADK_KPACKAGE_KMOD_NTFS_FS prompt "kmod-fs-ntfs...................... NTFS file system support" tristate select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS - select ADK_KERNEL_BLOCK default n help NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003. @@ -183,8 +188,7 @@ config ADK_KPACKAGE_KMOD_VFAT_FS select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS 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 y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n help This option provides support for normal Windows file systems with @@ -207,7 +211,6 @@ config ADK_KPACKAGE_KMOD_XFS_FS tristate select ADK_KERNEL_EXPORTFS select ADK_KPACKAGE_KMOD_CRYPTO_CRC32C - select ADK_KERNEL_BLOCK depends on !ADK_KERNEL_XFS_FS default n help @@ -223,7 +226,7 @@ config ADK_KPACKAGE_KMOD_XFS_FS with the IRIX version of XFS. config ADK_KPACKAGE_KMOD_FUSE_FS - prompt "kmod-fs-fuse...................... Filesystem in Userspace support" + prompt "kmod-fuse-fs...................... Filesystem in Userspace support" tristate default n help @@ -246,7 +249,6 @@ config ADK_KPACKAGE_KMOD_ISO9660_FS prompt "kmod-fs-iso9660................... ISO 9660 CDROM file system support" tristate select ADK_KERNEL_JOLIET - select ADK_KERNEL_BLOCK default n help This is the standard file system used on CD-ROMs. It was previously @@ -263,7 +265,6 @@ config ADK_KPACKAGE_KMOD_UDF_FS prompt "kmod-fs-udf....................... UDF file system support" tristate select ADK_KPACKAGE_KMOD_CRC_ITU_T - select ADK_KERNEL_BLOCK default n help This is the new file system used on some CD-ROMs and DVDs. Say Y if diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 48cd3ea73..3a8e18b25 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -68,7 +68,7 @@ config ADK_KERNEL_LOGO boolean menu "Graphic devices support" -depends on ADK_TARGET_WITH_VGA +depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU config ADK_KERNEL_LOGO_LINUX_CLUT224 prompt "Enable Linux penguin boot logo" @@ -76,6 +76,12 @@ config ADK_KERNEL_LOGO_LINUX_CLUT224 select ADK_KERNEL_LOGO default n +config ADK_KERNEL_FB_CON_DECOR + prompt "Enable fullscreen boot logo" + boolean + select ADK_PACKAGE_FBSPLASH + default n + config ADK_KERNEL_FB_VESA prompt "................................ Framebuffer support for VirtualBox Emulator (VESA)" boolean diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 650bc8729..ead74cc7e 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -128,7 +128,9 @@ config ADK_KERNEL_AEABI # endianess config ADK_KERNEL_CPU_BIG_ENDIAN + default y if ADK_big boolean config ADK_KERNEL_CPU_LITTLE_ENDIAN + default y if ADK_little boolean diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 62479c2cb..64bfb15f4 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -1,9 +1,6 @@ menu "Network devices support" comment "Ethernet network driver for target system is included into kernel" -config ADK_KERNEL_NETDEVICES - boolean - config ADK_KERNEL_NET_ETHERNET boolean @@ -42,7 +39,6 @@ config ADK_KERNEL_ATH_CARDS config ADK_KERNEL_CPMAC boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -52,7 +48,6 @@ config ADK_KERNEL_CPMAC config ADK_KERNEL_MACB boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -63,7 +58,6 @@ config ADK_KERNEL_MACB config ADK_KERNEL_PCNET32 boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -72,7 +66,6 @@ config ADK_KERNEL_PCNET32 config ADK_KERNEL_NATSEMI boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -82,7 +75,6 @@ config ADK_KERNEL_NATSEMI config ADK_KERNEL_VIA_RHINE boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -95,7 +87,6 @@ config ADK_KERNEL_VIA_RHINE config ADK_KERNEL_AR231X_ETHERNET boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -106,7 +97,6 @@ config ADK_KERNEL_AR231X_ETHERNET config ADK_KERNEL_KORINA boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -116,7 +106,6 @@ config ADK_KERNEL_KORINA config ADK_KERNEL_AG71XX boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -127,7 +116,6 @@ config ADK_KERNEL_AG71XX config ADK_KERNEL_B44 boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -137,7 +125,6 @@ config ADK_KERNEL_B44 config ADK_KERNEL_R8169 boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_MII @@ -147,7 +134,6 @@ config ADK_KERNEL_R8169 config ADK_KERNEL_USB_NET_SMSC95XX boolean - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_USB_USBNET default y if ADK_TARGET_SYSTEM_RASPBERRY_PI @@ -160,7 +146,6 @@ depends on ADK_TARGET_WITH_PCI config ADK_KPACKAGE_KMOD_NE2K_PCI prompt "kmod-net-ne2k-pci............. NE2000 PCI driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_VENDOR_NATSEMI @@ -173,7 +158,6 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI config ADK_KPACKAGE_KMOD_PCNET32 prompt "kmod-net-pcnet32.............. AMD PCNet32 PCI driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -184,7 +168,6 @@ config ADK_KPACKAGE_KMOD_PCNET32 config ADK_KPACKAGE_KMOD_8139CP prompt "kmod-net-rtl8139cp............ RTL8139C+ PCI driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_VENDOR_REALTEK @@ -196,7 +179,6 @@ config ADK_KPACKAGE_KMOD_8139CP config ADK_KPACKAGE_KMOD_8139TOO prompt "kmod-net-rtl8139.............. RTL8139 PCI driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII @@ -207,7 +189,6 @@ config ADK_KPACKAGE_KMOD_8139TOO config ADK_KPACKAGE_KMOD_E100 prompt "kmod-net-e100................. Intel(R) PRO/100+ driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII default n @@ -217,7 +198,6 @@ config ADK_KPACKAGE_KMOD_E100 config ADK_KPACKAGE_KMOD_E1000 prompt "kmod-net-e1000................ Intel(R) PRO/1000 Gigabit Ethernet driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 depends on !ADK_KERNEL_E1000 @@ -232,7 +212,6 @@ config ADK_KPACKAGE_KMOD_E1000 config ADK_KPACKAGE_KMOD_SKY2 prompt "kmod-net-sky2................. Marvell Yukon driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_NET_VENDOR_MARVELL @@ -243,7 +222,6 @@ config ADK_KPACKAGE_KMOD_SKY2 config ADK_KPACKAGE_KMOD_R8169 prompt "kmod-net-r8169................ RTL8169 driver" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_MII @@ -258,7 +236,6 @@ config ADK_KERNEL_WLAN boolean config ADK_KERNEL_WIRELESS - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_WLAN boolean diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index b43a566b9..d3f988845 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -36,16 +36,16 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER config ADK_KPACKAGE_KMOD_FULL_NAT tristate "Meta package for Full NAT" - select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30 + select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_34 select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_14 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_7 config ADK_KPACKAGE_KMOD_NF_NAT tristate 'Full NAT' depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_4_82 + depends on ADK_KERNEL_VERSION_3_4_84 help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by @@ -54,10 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT config ADK_KPACKAGE_KMOD_NF_NAT_IPV4 tristate 'Full NAT' depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_10_30 \ + depends on ADK_KERNEL_VERSION_3_10_34 \ || ADK_KERNEL_VERSION_3_11_10 \ - || ADK_KERNEL_VERSION_3_12_13 \ - || ADK_KERNEL_VERSION_3_13_6 + || ADK_KERNEL_VERSION_3_12_14 \ + || ADK_KERNEL_VERSION_3_13_7 help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 71a510d69..f35f2ce80 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -180,7 +180,6 @@ config ADK_KPACKAGE_KMOD_IPV6_SIT config ADK_KPACKAGE_KMOD_PPP prompt "kmod-ppp.......................... PPP support" tristate - select ADK_KERNEL_NETDEVICES select ADK_KERNEL_PPP_ASYNC select ADK_KERNEL_SLHC select ADK_KPACKAGE_KMOD_CRC_CCITT @@ -243,7 +242,6 @@ config ADK_KPACKAGE_KMOD_PPPOE config ADK_KPACKAGE_KMOD_TUN prompt "kmod-tun.......................... Universal TUN/TAP driver" tristate - select ADK_KERNEL_NETDEVICES default n help Kernel support for the TUN/TAP tunneling device diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 73db5e86d..c130523ef 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -1,6 +1,12 @@ config ADK_KERNEL_SPI boolean +config ADK_KERNEL_SPI_MASTER + boolean + +config ADK_KERNEL_SPI_XILINX + boolean + config ADK_KERNEL_SPI_AR71XX select ADK_KERNEL_SPI boolean diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 2d50e24b2..ac85f977e 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -7,20 +7,14 @@ config ADK_KERNEL_USB_SUPPORT config ADK_KERNEL_USB boolean select ADK_KERNEL_USB_SUPPORT - default y if ADK_TARGET_SYSTEM_QEMU_SH4 - default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n config ADK_KERNEL_USB_OHCI_HCD boolean - default y if ADK_TARGET_SYSTEM_QEMU_SH4 - default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n config ADK_KERNEL_USB_OHCI_HCD_PLATFORM boolean - default y if ADK_TARGET_SYSTEM_QEMU_SH4 - default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n config ADK_KERNEL_USB_LIBUSUAL diff --git a/target/linux/patches/3.10.33/bsd-compatibility.patch b/target/linux/patches/3.10.34/bsd-compatibility.patch index b954b658f..b954b658f 100644 --- a/target/linux/patches/3.10.33/bsd-compatibility.patch +++ b/target/linux/patches/3.10.34/bsd-compatibility.patch diff --git a/target/linux/patches/3.10.33/startup.patch b/target/linux/patches/3.10.34/startup.patch index 3ebc5db1e..3ebc5db1e 100644 --- a/target/linux/patches/3.10.33/startup.patch +++ b/target/linux/patches/3.10.34/startup.patch diff --git a/target/linux/patches/3.12.13/bsd-compatibility.patch b/target/linux/patches/3.12.14/bsd-compatibility.patch index b954b658f..b954b658f 100644 --- a/target/linux/patches/3.12.13/bsd-compatibility.patch +++ b/target/linux/patches/3.12.14/bsd-compatibility.patch diff --git a/target/linux/patches/3.12.13/defaults.patch b/target/linux/patches/3.12.14/defaults.patch index 6cdca084e..6cdca084e 100644 --- a/target/linux/patches/3.12.13/defaults.patch +++ b/target/linux/patches/3.12.14/defaults.patch diff --git a/target/linux/patches/3.12.13/disable-netfilter.patch b/target/linux/patches/3.12.14/disable-netfilter.patch index 7b1ca013a..7b1ca013a 100644 --- a/target/linux/patches/3.12.13/disable-netfilter.patch +++ b/target/linux/patches/3.12.14/disable-netfilter.patch diff --git a/target/linux/patches/3.12.13/export-symbol-for-exmap.patch b/target/linux/patches/3.12.14/export-symbol-for-exmap.patch index 4f0fc8449..4f0fc8449 100644 --- a/target/linux/patches/3.12.13/export-symbol-for-exmap.patch +++ b/target/linux/patches/3.12.14/export-symbol-for-exmap.patch diff --git a/target/linux/patches/3.12.13/gemalto.patch b/target/linux/patches/3.12.14/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.12.13/gemalto.patch +++ b/target/linux/patches/3.12.14/gemalto.patch diff --git a/target/linux/patches/3.12.13/lemote-rfkill.patch b/target/linux/patches/3.12.14/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.12.13/lemote-rfkill.patch +++ b/target/linux/patches/3.12.14/lemote-rfkill.patch diff --git a/target/linux/patches/3.12.13/microblaze-ethernet.patch b/target/linux/patches/3.12.14/microblaze-ethernet.patch index 742ab477e..742ab477e 100644 --- a/target/linux/patches/3.12.13/microblaze-ethernet.patch +++ b/target/linux/patches/3.12.14/microblaze-ethernet.patch diff --git a/target/linux/patches/3.12.13/microblaze-setup.patch b/target/linux/patches/3.12.14/microblaze-setup.patch index 43815f274..43815f274 100644 --- a/target/linux/patches/3.12.13/microblaze-setup.patch +++ b/target/linux/patches/3.12.14/microblaze-setup.patch diff --git a/target/linux/patches/3.12.13/mips-lzo-fix.patch b/target/linux/patches/3.12.14/mips-lzo-fix.patch index 0740bdc6a..0740bdc6a 100644 --- a/target/linux/patches/3.12.13/mips-lzo-fix.patch +++ b/target/linux/patches/3.12.14/mips-lzo-fix.patch diff --git a/target/linux/patches/3.12.13/mtd-rootfs.patch b/target/linux/patches/3.12.14/mtd-rootfs.patch index 775d5fc80..775d5fc80 100644 --- a/target/linux/patches/3.12.13/mtd-rootfs.patch +++ b/target/linux/patches/3.12.14/mtd-rootfs.patch diff --git a/target/linux/patches/3.12.13/non-static.patch b/target/linux/patches/3.12.14/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.12.13/non-static.patch +++ b/target/linux/patches/3.12.14/non-static.patch diff --git a/target/linux/patches/3.12.13/ppc64-missing-zlib.patch b/target/linux/patches/3.12.14/ppc64-missing-zlib.patch index c6e0616be..c6e0616be 100644 --- a/target/linux/patches/3.12.13/ppc64-missing-zlib.patch +++ b/target/linux/patches/3.12.14/ppc64-missing-zlib.patch diff --git a/target/linux/patches/3.12.13/raspberry.patch b/target/linux/patches/3.12.14/raspberry.patch index c306f4faf..c306f4faf 100644 --- a/target/linux/patches/3.12.13/raspberry.patch +++ b/target/linux/patches/3.12.14/raspberry.patch diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.14/startup.patch index 4cd477da1..4cd477da1 100644 --- a/target/linux/patches/3.12.13/startup.patch +++ b/target/linux/patches/3.12.14/startup.patch diff --git a/target/linux/patches/3.12.13/usb-defaults-off.patch b/target/linux/patches/3.12.14/usb-defaults-off.patch index 54dff2bd4..54dff2bd4 100644 --- a/target/linux/patches/3.12.13/usb-defaults-off.patch +++ b/target/linux/patches/3.12.14/usb-defaults-off.patch diff --git a/target/linux/patches/3.12.13/uuid.patch b/target/linux/patches/3.12.14/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.12.13/uuid.patch +++ b/target/linux/patches/3.12.14/uuid.patch diff --git a/target/linux/patches/3.12.13/vga-cons-default-off.patch b/target/linux/patches/3.12.14/vga-cons-default-off.patch index 08a57f783..08a57f783 100644 --- a/target/linux/patches/3.12.13/vga-cons-default-off.patch +++ b/target/linux/patches/3.12.14/vga-cons-default-off.patch diff --git a/target/linux/patches/3.12.13/wlan-cf.patch b/target/linux/patches/3.12.14/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.12.13/wlan-cf.patch +++ b/target/linux/patches/3.12.14/wlan-cf.patch diff --git a/target/linux/patches/3.12.13/xargs.patch b/target/linux/patches/3.12.14/xargs.patch index 2c7b3df59..2c7b3df59 100644 --- a/target/linux/patches/3.12.13/xargs.patch +++ b/target/linux/patches/3.12.14/xargs.patch diff --git a/target/linux/patches/3.12.13/zlib-inflate.patch b/target/linux/patches/3.12.14/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.12.13/zlib-inflate.patch +++ b/target/linux/patches/3.12.14/zlib-inflate.patch diff --git a/target/linux/patches/3.13.6/bsd-compatibility.patch b/target/linux/patches/3.13.7/bsd-compatibility.patch index b954b658f..b954b658f 100644 --- a/target/linux/patches/3.13.6/bsd-compatibility.patch +++ b/target/linux/patches/3.13.7/bsd-compatibility.patch diff --git a/target/linux/patches/3.13.6/defaults.patch b/target/linux/patches/3.13.7/defaults.patch index 6cdca084e..6cdca084e 100644 --- a/target/linux/patches/3.13.6/defaults.patch +++ b/target/linux/patches/3.13.7/defaults.patch diff --git a/target/linux/patches/3.13.6/disable-netfilter.patch b/target/linux/patches/3.13.7/disable-netfilter.patch index 7b1ca013a..7b1ca013a 100644 --- a/target/linux/patches/3.13.6/disable-netfilter.patch +++ b/target/linux/patches/3.13.7/disable-netfilter.patch diff --git a/target/linux/patches/3.13.6/export-symbol-for-exmap.patch b/target/linux/patches/3.13.7/export-symbol-for-exmap.patch index 4f0fc8449..4f0fc8449 100644 --- a/target/linux/patches/3.13.6/export-symbol-for-exmap.patch +++ b/target/linux/patches/3.13.7/export-symbol-for-exmap.patch diff --git a/target/linux/patches/3.13.7/fblogo.patch b/target/linux/patches/3.13.7/fblogo.patch new file mode 100644 index 000000000..cbbb4216f --- /dev/null +++ b/target/linux/patches/3.13.7/fblogo.patch @@ -0,0 +1,2097 @@ +diff -Nur linux-3.13.7.orig/Documentation/fb/00-INDEX linux-3.13.7/Documentation/fb/00-INDEX +--- linux-3.13.7.orig/Documentation/fb/00-INDEX 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/Documentation/fb/00-INDEX 2014-03-29 16:03:17.000000000 +0100 +@@ -21,6 +21,8 @@ + - info on the driver for EP93xx LCD controller. + fbcon.txt + - intro to and usage guide for the framebuffer console (fbcon). ++fbcondecor.txt ++ - info on the Framebuffer Console Decoration + framebuffer.txt + - introduction to frame buffer devices. + gxfb.txt +diff -Nur linux-3.13.7.orig/Documentation/fb/fbcondecor.txt linux-3.13.7/Documentation/fb/fbcondecor.txt +--- linux-3.13.7.orig/Documentation/fb/fbcondecor.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.13.7/Documentation/fb/fbcondecor.txt 2014-03-29 16:03:17.000000000 +0100 +@@ -0,0 +1,207 @@ ++What is it? ++----------- ++ ++The framebuffer decorations are a kernel feature which allows displaying a ++background picture on selected consoles. ++ ++What do I need to get it to work? ++--------------------------------- ++ ++To get fbcondecor up-and-running you will have to: ++ 1) get a copy of splashutils [1] or a similar program ++ 2) get some fbcondecor themes ++ 3) build the kernel helper program ++ 4) build your kernel with the FB_CON_DECOR option enabled. ++ ++To get fbcondecor operational right after fbcon initialization is finished, you ++will have to include a theme and the kernel helper into your initramfs image. ++Please refer to splashutils documentation for instructions on how to do that. ++ ++[1] The splashutils package can be downloaded from: ++ http://github.com/alanhaggai/fbsplash ++ ++The userspace helper ++-------------------- ++ ++The userspace fbcondecor helper (by default: /sbin/fbcondecor_helper) is called by the ++kernel whenever an important event occurs and the kernel needs some kind of ++job to be carried out. Important events include console switches and video ++mode switches (the kernel requests background images and configuration ++parameters for the current console). The fbcondecor helper must be accessible at ++all times. If it's not, fbcondecor will be switched off automatically. ++ ++It's possible to set path to the fbcondecor helper by writing it to ++/proc/sys/kernel/fbcondecor. ++ ++***************************************************************************** ++ ++The information below is mostly technical stuff. There's probably no need to ++read it unless you plan to develop a userspace helper. ++ ++The fbcondecor protocol ++----------------------- ++ ++The fbcondecor protocol defines a communication interface between the kernel and ++the userspace fbcondecor helper. ++ ++The kernel side is responsible for: ++ ++ * rendering console text, using an image as a background (instead of a ++ standard solid color fbcon uses), ++ * accepting commands from the user via ioctls on the fbcondecor device, ++ * calling the userspace helper to set things up as soon as the fb subsystem ++ is initialized. ++ ++The userspace helper is responsible for everything else, including parsing ++configuration files, decompressing the image files whenever the kernel needs ++it, and communicating with the kernel if necessary. ++ ++The fbcondecor protocol specifies how communication is done in both ways: ++kernel->userspace and userspace->helper. ++ ++Kernel -> Userspace ++------------------- ++ ++The kernel communicates with the userspace helper by calling it and specifying ++the task to be done in a series of arguments. ++ ++The arguments follow the pattern: ++<fbcondecor protocol version> <command> <parameters> ++ ++All commands defined in fbcondecor protocol v2 have the following parameters: ++ virtual console ++ framebuffer number ++ theme ++ ++Fbcondecor protocol v1 specified an additional 'fbcondecor mode' after the ++framebuffer number. Fbcondecor protocol v1 is deprecated and should not be used. ++ ++Fbcondecor protocol v2 specifies the following commands: ++ ++getpic ++------ ++ The kernel issues this command to request image data. It's up to the ++ userspace helper to find a background image appropriate for the specified ++ theme and the current resolution. The userspace helper should respond by ++ issuing the FBIOCONDECOR_SETPIC ioctl. ++ ++init ++---- ++ The kernel issues this command after the fbcondecor device is created and ++ the fbcondecor interface is initialized. Upon receiving 'init', the userspace ++ helper should parse the kernel command line (/proc/cmdline) or otherwise ++ decide whether fbcondecor is to be activated. ++ ++ To activate fbcondecor on the first console the helper should issue the ++ FBIOCONDECOR_SETCFG, FBIOCONDECOR_SETPIC and FBIOCONDECOR_SETSTATE commands, ++ in the above-mentioned order. ++ ++ When the userspace helper is called in an early phase of the boot process ++ (right after the initialization of fbcon), no filesystems will be mounted. ++ The helper program should mount sysfs and then create the appropriate ++ framebuffer, fbcondecor and tty0 devices (if they don't already exist) to get ++ current display settings and to be able to communicate with the kernel side. ++ It should probably also mount the procfs to be able to parse the kernel ++ command line parameters. ++ ++ Note that the console sem is not held when the kernel calls fbcondecor_helper ++ with the 'init' command. The fbcondecor helper should perform all ioctls with ++ origin set to FBCON_DECOR_IO_ORIG_USER. ++ ++modechange ++---------- ++ The kernel issues this command on a mode change. The helper's response should ++ be similar to the response to the 'init' command. Note that this time the ++ console sem is held and all ioctls must be performed with origin set to ++ FBCON_DECOR_IO_ORIG_KERNEL. ++ ++ ++Userspace -> Kernel ++------------------- ++ ++Userspace programs can communicate with fbcondecor via ioctls on the ++fbcondecor device. These ioctls are to be used by both the userspace helper ++(called only by the kernel) and userspace configuration tools (run by the users). ++ ++The fbcondecor helper should set the origin field to FBCON_DECOR_IO_ORIG_KERNEL ++when doing the appropriate ioctls. All userspace configuration tools should ++use FBCON_DECOR_IO_ORIG_USER. Failure to set the appropriate value in the origin ++field when performing ioctls from the kernel helper will most likely result ++in a console deadlock. ++ ++FBCON_DECOR_IO_ORIG_KERNEL instructs fbcondecor not to try to acquire the console ++semaphore. Not surprisingly, FBCON_DECOR_IO_ORIG_USER instructs it to acquire ++the console sem. ++ ++The framebuffer console decoration provides the following ioctls (all defined in ++linux/fb.h): ++ ++FBIOCONDECOR_SETPIC ++description: loads a background picture for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: struct fb_image* ++notes: ++If called for consoles other than the current foreground one, the picture data ++will be ignored. ++ ++If the current virtual console is running in a 8-bpp mode, the cmap substruct ++of fb_image has to be filled appropriately: start should be set to 16 (first ++16 colors are reserved for fbcon), len to a value <= 240 and red, green and ++blue should point to valid cmap data. The transp field is ingored. The fields ++dx, dy, bg_color, fg_color in fb_image are ignored as well. ++ ++FBIOCONDECOR_SETCFG ++description: sets the fbcondecor config for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: struct vc_decor* ++notes: The structure has to be filled with valid data. ++ ++FBIOCONDECOR_GETCFG ++description: gets the fbcondecor config for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: struct vc_decor* ++ ++FBIOCONDECOR_SETSTATE ++description: sets the fbcondecor state for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: unsigned int* ++ values: 0 = disabled, 1 = enabled. ++ ++FBIOCONDECOR_GETSTATE ++description: gets the fbcondecor state for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: unsigned int* ++ values: as in FBIOCONDECOR_SETSTATE ++ ++Info on used structures: ++ ++Definition of struct vc_decor can be found in linux/console_decor.h. It's ++heavily commented. Note that the 'theme' field should point to a string ++no longer than FBCON_DECOR_THEME_LEN. When FBIOCONDECOR_GETCFG call is ++performed, the theme field should point to a char buffer of length ++FBCON_DECOR_THEME_LEN. ++ ++Definition of struct fbcon_decor_iowrapper can be found in linux/fb.h. ++The fields in this struct have the following meaning: ++ ++vc: ++Virtual console number. ++ ++origin: ++Specifies if the ioctl is performed as a response to a kernel request. The ++fbcondecor helper should set this field to FBCON_DECOR_IO_ORIG_KERNEL, userspace ++programs should set it to FBCON_DECOR_IO_ORIG_USER. This field is necessary to ++avoid console semaphore deadlocks. ++ ++data: ++Pointer to a data structure appropriate for the performed ioctl. Type of ++the data struct is specified in the ioctls description. ++ ++***************************************************************************** ++ ++Credit ++------ ++ ++Original 'bootsplash' project & implementation by: ++ Volker Poplawski <volker@poplawski.de>, Stefan Reinauer <stepan@suse.de>, ++ Steffen Winterfeldt <snwint@suse.de>, Michael Schroeder <mls@suse.de>, ++ Ken Wimer <wimer@suse.de>. ++ ++Fbcondecor, fbcondecor protocol design, current implementation & docs by: ++ Michal Januszewski <michalj+fbcondecor@gmail.com> ++ +diff -Nur linux-3.13.7.orig/drivers/Makefile linux-3.13.7/drivers/Makefile +--- linux-3.13.7.orig/drivers/Makefile 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/Makefile 2014-03-29 16:03:17.000000000 +0100 +@@ -17,6 +17,10 @@ + obj-$(CONFIG_PCI) += pci/ + obj-$(CONFIG_PARISC) += parisc/ + obj-$(CONFIG_RAPIDIO) += rapidio/ ++# tty/ comes before char/ so that the VT console is the boot-time ++# default. ++obj-y += tty/ ++obj-y += char/ + obj-y += video/ + obj-y += idle/ + +@@ -42,11 +46,6 @@ + # reset controllers early, since gpu drivers might rely on them to initialize + obj-$(CONFIG_RESET_CONTROLLER) += reset/ + +-# tty/ comes before char/ so that the VT console is the boot-time +-# default. +-obj-y += tty/ +-obj-y += char/ +- + # gpu/ comes after char for AGP vs DRM startup + obj-y += gpu/ + +diff -Nur linux-3.13.7.orig/drivers/video/Kconfig linux-3.13.7/drivers/video/Kconfig +--- linux-3.13.7.orig/drivers/video/Kconfig 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/video/Kconfig 2014-03-29 16:03:17.000000000 +0100 +@@ -1231,7 +1231,6 @@ + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT +- select FB_TILEBLITTING + select FB_MACMODES if PPC_PMAC + ---help--- + Say Y here if you have a Matrox Millennium, Matrox Millennium II, +diff -Nur linux-3.13.7.orig/drivers/video/console/Kconfig linux-3.13.7/drivers/video/console/Kconfig +--- linux-3.13.7.orig/drivers/video/console/Kconfig 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/video/console/Kconfig 2014-03-29 16:03:17.000000000 +0100 +@@ -125,6 +125,19 @@ + such that other users of the framebuffer will remain normally + oriented. + ++config FB_CON_DECOR ++ bool "Support for the Framebuffer Console Decorations" ++ depends on FRAMEBUFFER_CONSOLE=y && !FB_TILEBLITTING ++ default n ++ ---help--- ++ This option enables support for framebuffer console decorations which ++ makes it possible to display images in the background of the system ++ consoles. Note that userspace utilities are necessary in order to take ++ advantage of these features. Refer to Documentation/fb/fbcondecor.txt ++ for more information. ++ ++ If unsure, say N. ++ + config STI_CONSOLE + bool "STI text console" + depends on PARISC +diff -Nur linux-3.13.7.orig/drivers/video/console/Makefile linux-3.13.7/drivers/video/console/Makefile +--- linux-3.13.7.orig/drivers/video/console/Makefile 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/video/console/Makefile 2014-03-29 16:03:17.000000000 +0100 +@@ -16,4 +16,5 @@ + fbcon_ccw.o + endif + ++obj-$(CONFIG_FB_CON_DECOR) += fbcondecor.o cfbcondecor.o + obj-$(CONFIG_FB_STI) += sticore.o +diff -Nur linux-3.13.7.orig/drivers/video/console/bitblit.c linux-3.13.7/drivers/video/console/bitblit.c +--- linux-3.13.7.orig/drivers/video/console/bitblit.c 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/video/console/bitblit.c 2014-03-29 16:03:17.000000000 +0100 +@@ -18,6 +18,7 @@ + #include <linux/console.h> + #include <asm/types.h> + #include "fbcon.h" ++#include "fbcondecor.h" + + /* + * Accelerated handlers. +@@ -55,6 +56,13 @@ + area.height = height * vc->vc_font.height; + area.width = width * vc->vc_font.width; + ++ if (fbcon_decor_active(info, vc)) { ++ area.sx += vc->vc_decor.tx; ++ area.sy += vc->vc_decor.ty; ++ area.dx += vc->vc_decor.tx; ++ area.dy += vc->vc_decor.ty; ++ } ++ + info->fbops->fb_copyarea(info, &area); + } + +@@ -380,11 +388,15 @@ + cursor.image.depth = 1; + cursor.rop = ROP_XOR; + +- if (info->fbops->fb_cursor) +- err = info->fbops->fb_cursor(info, &cursor); ++ if (fbcon_decor_active(info, vc)) { ++ fbcon_decor_cursor(info, &cursor); ++ } else { ++ if (info->fbops->fb_cursor) ++ err = info->fbops->fb_cursor(info, &cursor); + +- if (err) +- soft_cursor(info, &cursor); ++ if (err) ++ soft_cursor(info, &cursor); ++ } + + ops->cursor_reset = 0; + } +diff -Nur linux-3.13.7.orig/drivers/video/console/cfbcondecor.c linux-3.13.7/drivers/video/console/cfbcondecor.c +--- linux-3.13.7.orig/drivers/video/console/cfbcondecor.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.13.7/drivers/video/console/cfbcondecor.c 2014-03-29 16:03:17.000000000 +0100 +@@ -0,0 +1,471 @@ ++/* ++ * linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions ++ * ++ * Copyright (C) 2004 Michal Januszewski <michalj+fbcondecor@gmail.com> ++ * ++ * Code based upon "Bootdecor" (C) 2001-2003 ++ * Volker Poplawski <volker@poplawski.de>, ++ * Stefan Reinauer <stepan@suse.de>, ++ * Steffen Winterfeldt <snwint@suse.de>, ++ * Michael Schroeder <mls@suse.de>, ++ * Ken Wimer <wimer@suse.de>. ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive for ++ * more details. ++ */ ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/fb.h> ++#include <linux/selection.h> ++#include <linux/slab.h> ++#include <linux/vt_kern.h> ++#include <asm/irq.h> ++ ++#include "fbcon.h" ++#include "fbcondecor.h" ++ ++#define parse_pixel(shift,bpp,type) \ ++ do { \ ++ if (d & (0x80 >> (shift))) \ ++ dd2[(shift)] = fgx; \ ++ else \ ++ dd2[(shift)] = transparent ? *(type *)decor_src : bgx; \ ++ decor_src += (bpp); \ ++ } while (0) \ ++ ++extern int get_color(struct vc_data *vc, struct fb_info *info, ++ u16 c, int is_fg); ++ ++void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc) ++{ ++ int i, j, k; ++ int minlen = min(min(info->var.red.length, info->var.green.length), ++ info->var.blue.length); ++ u32 col; ++ ++ for (j = i = 0; i < 16; i++) { ++ k = color_table[i]; ++ ++ col = ((vc->vc_palette[j++] >> (8-minlen)) ++ << info->var.red.offset); ++ col |= ((vc->vc_palette[j++] >> (8-minlen)) ++ << info->var.green.offset); ++ col |= ((vc->vc_palette[j++] >> (8-minlen)) ++ << info->var.blue.offset); ++ ((u32 *)info->pseudo_palette)[k] = col; ++ } ++} ++ ++void fbcon_decor_renderc(struct fb_info *info, int ypos, int xpos, int height, ++ int width, u8* src, u32 fgx, u32 bgx, u8 transparent) ++{ ++ unsigned int x, y; ++ u32 dd; ++ int bytespp = ((info->var.bits_per_pixel + 7) >> 3); ++ unsigned int d = ypos * info->fix.line_length + xpos * bytespp; ++ unsigned int ds = (ypos * info->var.xres + xpos) * bytespp; ++ u16 dd2[4]; ++ ++ u8* decor_src = (u8 *)(info->bgdecor.data + ds); ++ u8* dst = (u8 *)(info->screen_base + d); ++ ++ if ((ypos + height) > info->var.yres || (xpos + width) > info->var.xres) ++ return; ++ ++ for (y = 0; y < height; y++) { ++ switch (info->var.bits_per_pixel) { ++ ++ case 32: ++ for (x = 0; x < width; x++) { ++ ++ if ((x & 7) == 0) ++ d = *src++; ++ if (d & 0x80) ++ dd = fgx; ++ else ++ dd = transparent ? ++ *(u32 *)decor_src : bgx; ++ ++ d <<= 1; ++ decor_src += 4; ++ fb_writel(dd, dst); ++ dst += 4; ++ } ++ break; ++ case 24: ++ for (x = 0; x < width; x++) { ++ ++ if ((x & 7) == 0) ++ d = *src++; ++ if (d & 0x80) ++ dd = fgx; ++ else ++ dd = transparent ? ++ (*(u32 *)decor_src & 0xffffff) : bgx; ++ ++ d <<= 1; ++ decor_src += 3; ++#ifdef __LITTLE_ENDIAN ++ fb_writew(dd & 0xffff, dst); ++ dst += 2; ++ fb_writeb((dd >> 16), dst); ++#else ++ fb_writew(dd >> 8, dst); ++ dst += 2; ++ fb_writeb(dd & 0xff, dst); ++#endif ++ dst++; ++ } ++ break; ++ case 16: ++ for (x = 0; x < width; x += 2) { ++ if ((x & 7) == 0) ++ d = *src++; ++ ++ parse_pixel(0, 2, u16); ++ parse_pixel(1, 2, u16); ++#ifdef __LITTLE_ENDIAN ++ dd = dd2[0] | (dd2[1] << 16); ++#else ++ dd = dd2[1] | (dd2[0] << 16); ++#endif ++ d <<= 2; ++ fb_writel(dd, dst); ++ dst += 4; ++ } ++ break; ++ ++ case 8: ++ for (x = 0; x < width; x += 4) { ++ if ((x & 7) == 0) ++ d = *src++; ++ ++ parse_pixel(0, 1, u8); ++ parse_pixel(1, 1, u8); ++ parse_pixel(2, 1, u8); ++ parse_pixel(3, 1, u8); ++ ++#ifdef __LITTLE_ENDIAN ++ dd = dd2[0] | (dd2[1] << 8) | (dd2[2] << 16) | (dd2[3] << 24); ++#else ++ dd = dd2[3] | (dd2[2] << 8) | (dd2[1] << 16) | (dd2[0] << 24); ++#endif ++ d <<= 4; ++ fb_writel(dd, dst); ++ dst += 4; ++ } ++ } ++ ++ dst += info->fix.line_length - width * bytespp; ++ decor_src += (info->var.xres - width) * bytespp; ++ } ++} ++ ++#define cc2cx(a) \ ++ ((info->fix.visual == FB_VISUAL_TRUECOLOR || \ ++ info->fix.visual == FB_VISUAL_DIRECTCOLOR) ? \ ++ ((u32*)info->pseudo_palette)[a] : a) ++ ++void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, ++ const unsigned short *s, int count, int yy, int xx) ++{ ++ unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; ++ struct fbcon_ops *ops = info->fbcon_par; ++ int fg_color, bg_color, transparent; ++ u8 *src; ++ u32 bgx, fgx; ++ u16 c = scr_readw(s); ++ ++ fg_color = get_color(vc, info, c, 1); ++ bg_color = get_color(vc, info, c, 0); ++ ++ /* Don't paint the background image if console is blanked */ ++ transparent = ops->blank_state ? 0 : ++ (vc->vc_decor.bg_color == bg_color); ++ ++ xx = xx * vc->vc_font.width + vc->vc_decor.tx; ++ yy = yy * vc->vc_font.height + vc->vc_decor.ty; ++ ++ fgx = cc2cx(fg_color); ++ bgx = cc2cx(bg_color); ++ ++ while (count--) { ++ c = scr_readw(s++); ++ src = vc->vc_font.data + (c & charmask) * vc->vc_font.height * ++ ((vc->vc_font.width + 7) >> 3); ++ ++ fbcon_decor_renderc(info, yy, xx, vc->vc_font.height, ++ vc->vc_font.width, src, fgx, bgx, transparent); ++ xx += vc->vc_font.width; ++ } ++} ++ ++void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor) ++{ ++ int i; ++ unsigned int dsize, s_pitch; ++ struct fbcon_ops *ops = info->fbcon_par; ++ struct vc_data* vc; ++ u8 *src; ++ ++ /* we really don't need any cursors while the console is blanked */ ++ if (info->state != FBINFO_STATE_RUNNING || ops->blank_state) ++ return; ++ ++ vc = vc_cons[ops->currcon].d; ++ ++ src = kmalloc(64 + sizeof(struct fb_image), GFP_ATOMIC); ++ if (!src) ++ return; ++ ++ s_pitch = (cursor->image.width + 7) >> 3; ++ dsize = s_pitch * cursor->image.height; ++ if (cursor->enable) { ++ switch (cursor->rop) { ++ case ROP_XOR: ++ for (i = 0; i < dsize; i++) ++ src[i] = cursor->image.data[i] ^ cursor->mask[i]; ++ break; ++ case ROP_COPY: ++ default: ++ for (i = 0; i < dsize; i++) ++ src[i] = cursor->image.data[i] & cursor->mask[i]; ++ break; ++ } ++ } else ++ memcpy(src, cursor->image.data, dsize); ++ ++ fbcon_decor_renderc(info, ++ cursor->image.dy + vc->vc_decor.ty, ++ cursor->image.dx + vc->vc_decor.tx, ++ cursor->image.height, ++ cursor->image.width, ++ (u8*)src, ++ cc2cx(cursor->image.fg_color), ++ cc2cx(cursor->image.bg_color), ++ cursor->image.bg_color == vc->vc_decor.bg_color); ++ ++ kfree(src); ++} ++ ++static void decorset(u8 *dst, int height, int width, int dstbytes, ++ u32 bgx, int bpp) ++{ ++ int i; ++ ++ if (bpp == 8) ++ bgx |= bgx << 8; ++ if (bpp == 16 || bpp == 8) ++ bgx |= bgx << 16; ++ ++ while (height-- > 0) { ++ u8 *p = dst; ++ ++ switch (bpp) { ++ ++ case 32: ++ for (i=0; i < width; i++) { ++ fb_writel(bgx, p); p += 4; ++ } ++ break; ++ case 24: ++ for (i=0; i < width; i++) { ++#ifdef __LITTLE_ENDIAN ++ fb_writew((bgx & 0xffff),(u16*)p); p += 2; ++ fb_writeb((bgx >> 16),p++); ++#else ++ fb_writew((bgx >> 8),(u16*)p); p += 2; ++ fb_writeb((bgx & 0xff),p++); ++#endif ++ } ++ case 16: ++ for (i=0; i < width/4; i++) { ++ fb_writel(bgx,p); p += 4; ++ fb_writel(bgx,p); p += 4; ++ } ++ if (width & 2) { ++ fb_writel(bgx,p); p += 4; ++ } ++ if (width & 1) ++ fb_writew(bgx,(u16*)p); ++ break; ++ case 8: ++ for (i=0; i < width/4; i++) { ++ fb_writel(bgx,p); p += 4; ++ } ++ ++ if (width & 2) { ++ fb_writew(bgx,p); p += 2; ++ } ++ if (width & 1) ++ fb_writeb(bgx,(u8*)p); ++ break; ++ ++ } ++ dst += dstbytes; ++ } ++} ++ ++void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes, ++ int srclinebytes, int bpp) ++{ ++ int i; ++ ++ while (height-- > 0) { ++ u32 *p = (u32 *)dst; ++ u32 *q = (u32 *)src; ++ ++ switch (bpp) { ++ ++ case 32: ++ for (i=0; i < width; i++) ++ fb_writel(*q++, p++); ++ break; ++ case 24: ++ for (i=0; i < (width*3/4); i++) ++ fb_writel(*q++, p++); ++ if ((width*3) % 4) { ++ if (width & 2) { ++ fb_writeb(*(u8*)q, (u8*)p); ++ } else if (width & 1) { ++ fb_writew(*(u16*)q, (u16*)p); ++ fb_writeb(*(u8*)((u16*)q+1),(u8*)((u16*)p+2)); ++ } ++ } ++ break; ++ case 16: ++ for (i=0; i < width/4; i++) { ++ fb_writel(*q++, p++); ++ fb_writel(*q++, p++); ++ } ++ if (width & 2) ++ fb_writel(*q++, p++); ++ if (width & 1) ++ fb_writew(*(u16*)q, (u16*)p); ++ break; ++ case 8: ++ for (i=0; i < width/4; i++) ++ fb_writel(*q++, p++); ++ ++ if (width & 2) { ++ fb_writew(*(u16*)q, (u16*)p); ++ q = (u32*) ((u16*)q + 1); ++ p = (u32*) ((u16*)p + 1); ++ } ++ if (width & 1) ++ fb_writeb(*(u8*)q, (u8*)p); ++ break; ++ } ++ ++ dst += linebytes; ++ src += srclinebytes; ++ } ++} ++ ++static void decorfill(struct fb_info *info, int sy, int sx, int height, ++ int width) ++{ ++ int bytespp = ((info->var.bits_per_pixel + 7) >> 3); ++ int d = sy * info->fix.line_length + sx * bytespp; ++ int ds = (sy * info->var.xres + sx) * bytespp; ++ ++ fbcon_decor_copy((u8 *)(info->screen_base + d), (u8 *)(info->bgdecor.data + ds), ++ height, width, info->fix.line_length, info->var.xres * bytespp, ++ info->var.bits_per_pixel); ++} ++ ++void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, ++ int height, int width) ++{ ++ int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; ++ struct fbcon_ops *ops = info->fbcon_par; ++ u8 *dst; ++ int transparent, bg_color = attr_bgcol_ec(bgshift, vc, info); ++ ++ transparent = (vc->vc_decor.bg_color == bg_color); ++ sy = sy * vc->vc_font.height + vc->vc_decor.ty; ++ sx = sx * vc->vc_font.width + vc->vc_decor.tx; ++ height *= vc->vc_font.height; ++ width *= vc->vc_font.width; ++ ++ /* Don't paint the background image if console is blanked */ ++ if (transparent && !ops->blank_state) { ++ decorfill(info, sy, sx, height, width); ++ } else { ++ dst = (u8 *)(info->screen_base + sy * info->fix.line_length + ++ sx * ((info->var.bits_per_pixel + 7) >> 3)); ++ decorset(dst, height, width, info->fix.line_length, cc2cx(bg_color), ++ info->var.bits_per_pixel); ++ } ++} ++ ++void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, ++ int bottom_only) ++{ ++ unsigned int tw = vc->vc_cols*vc->vc_font.width; ++ unsigned int th = vc->vc_rows*vc->vc_font.height; ++ ++ if (!bottom_only) { ++ /* top margin */ ++ decorfill(info, 0, 0, vc->vc_decor.ty, info->var.xres); ++ /* left margin */ ++ decorfill(info, vc->vc_decor.ty, 0, th, vc->vc_decor.tx); ++ /* right margin */ ++ decorfill(info, vc->vc_decor.ty, vc->vc_decor.tx + tw, th, ++ info->var.xres - vc->vc_decor.tx - tw); ++ } ++ decorfill(info, vc->vc_decor.ty + th, 0, ++ info->var.yres - vc->vc_decor.ty - th, info->var.xres); ++} ++ ++void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, ++ int sx, int dx, int width) ++{ ++ u16 *d = (u16 *) (vc->vc_origin + vc->vc_size_row * y + dx * 2); ++ u16 *s = d + (dx - sx); ++ u16 *start = d; ++ u16 *ls = d; ++ u16 *le = d + width; ++ u16 c; ++ int x = dx; ++ u16 attr = 1; ++ ++ do { ++ c = scr_readw(d); ++ if (attr != (c & 0xff00)) { ++ attr = c & 0xff00; ++ if (d > start) { ++ fbcon_decor_putcs(vc, info, start, d - start, y, x); ++ x += d - start; ++ start = d; ++ } ++ } ++ if (s >= ls && s < le && c == scr_readw(s)) { ++ if (d > start) { ++ fbcon_decor_putcs(vc, info, start, d - start, y, x); ++ x += d - start + 1; ++ start = d + 1; ++ } else { ++ x++; ++ start++; ++ } ++ } ++ s++; ++ d++; ++ } while (d < le); ++ if (d > start) ++ fbcon_decor_putcs(vc, info, start, d - start, y, x); ++} ++ ++void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank) ++{ ++ if (blank) { ++ decorset((u8 *)info->screen_base, info->var.yres, info->var.xres, ++ info->fix.line_length, 0, info->var.bits_per_pixel); ++ } else { ++ update_screen(vc); ++ fbcon_decor_clear_margins(vc, info, 0); ++ } ++} ++ +diff -Nur linux-3.13.7.orig/drivers/video/console/fbcon.c linux-3.13.7/drivers/video/console/fbcon.c +--- linux-3.13.7.orig/drivers/video/console/fbcon.c 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/video/console/fbcon.c 2014-03-29 16:03:17.000000000 +0100 +@@ -79,6 +79,7 @@ + #include <asm/irq.h> + + #include "fbcon.h" ++#include "fbcondecor.h" + + #ifdef FBCONDEBUG + # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args) +@@ -94,7 +95,7 @@ + + static struct display fb_display[MAX_NR_CONSOLES]; + +-static signed char con2fb_map[MAX_NR_CONSOLES]; ++signed char con2fb_map[MAX_NR_CONSOLES]; + static signed char con2fb_map_boot[MAX_NR_CONSOLES]; + + static int logo_lines; +@@ -286,7 +287,7 @@ + !vt_force_oops_output(vc); + } + +-static int get_color(struct vc_data *vc, struct fb_info *info, ++int get_color(struct vc_data *vc, struct fb_info *info, + u16 c, int is_fg) + { + int depth = fb_get_color_depth(&info->var, &info->fix); +@@ -551,6 +552,9 @@ + info_idx = -1; + } else { + fbcon_has_console_bind = 1; ++#ifdef CONFIG_FB_CON_DECOR ++ fbcon_decor_init(); ++#endif + } + + return err; +@@ -1007,6 +1011,12 @@ + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); + cols /= vc->vc_font.width; + rows /= vc->vc_font.height; ++ ++ if (fbcon_decor_active(info, vc)) { ++ cols = vc->vc_decor.twidth / vc->vc_font.width; ++ rows = vc->vc_decor.theight / vc->vc_font.height; ++ } ++ + vc_resize(vc, cols, rows); + + DPRINTK("mode: %s\n", info->fix.id); +@@ -1036,7 +1046,7 @@ + cap = info->flags; + + if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || +- (info->fix.type == FB_TYPE_TEXT)) ++ (info->fix.type == FB_TYPE_TEXT) || fbcon_decor_active(info, vc)) + logo = 0; + + if (var_to_display(p, &info->var, info)) +@@ -1260,6 +1270,11 @@ + fbcon_clear_margins(vc, 0); + } + ++ if (fbcon_decor_active(info, vc)) { ++ fbcon_decor_clear(vc, info, sy, sx, height, width); ++ return; ++ } ++ + /* Split blits that cross physical y_wrap boundary */ + + y_break = p->vrows - p->yscroll; +@@ -1279,10 +1294,15 @@ + struct display *p = &fb_display[vc->vc_num]; + struct fbcon_ops *ops = info->fbcon_par; + +- if (!fbcon_is_inactive(vc, info)) +- ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, +- get_color(vc, info, scr_readw(s), 1), +- get_color(vc, info, scr_readw(s), 0)); ++ if (!fbcon_is_inactive(vc, info)) { ++ ++ if (fbcon_decor_active(info, vc)) ++ fbcon_decor_putcs(vc, info, s, count, ypos, xpos); ++ else ++ ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, ++ get_color(vc, info, scr_readw(s), 1), ++ get_color(vc, info, scr_readw(s), 0)); ++ } + } + + static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) +@@ -1298,8 +1318,13 @@ + struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; + struct fbcon_ops *ops = info->fbcon_par; + +- if (!fbcon_is_inactive(vc, info)) +- ops->clear_margins(vc, info, bottom_only); ++ if (!fbcon_is_inactive(vc, info)) { ++ if (fbcon_decor_active(info, vc)) { ++ fbcon_decor_clear_margins(vc, info, bottom_only); ++ } else { ++ ops->clear_margins(vc, info, bottom_only); ++ } ++ } + } + + static void fbcon_cursor(struct vc_data *vc, int mode) +@@ -1819,7 +1844,7 @@ + count = vc->vc_rows; + if (softback_top) + fbcon_softback_note(vc, t, count); +- if (logo_shown >= 0) ++ if (logo_shown >= 0 || fbcon_decor_active(info, vc)) + goto redraw_up; + switch (p->scrollmode) { + case SCROLL_MOVE: +@@ -1912,6 +1937,8 @@ + count = vc->vc_rows; + if (logo_shown >= 0) + goto redraw_down; ++ if (fbcon_decor_active(info, vc)) ++ goto redraw_down; + switch (p->scrollmode) { + case SCROLL_MOVE: + fbcon_redraw_blit(vc, info, p, b - 1, b - t - count, +@@ -2060,6 +2087,13 @@ + } + return; + } ++ ++ if (fbcon_decor_active(info, vc) && sy == dy && height == 1) { ++ /* must use slower redraw bmove to keep background pic intact */ ++ fbcon_decor_bmove_redraw(vc, info, sy, sx, dx, width); ++ return; ++ } ++ + ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx, + height, width); + } +@@ -2130,8 +2164,8 @@ + var.yres = virt_h * virt_fh; + x_diff = info->var.xres - var.xres; + y_diff = info->var.yres - var.yres; +- if (x_diff < 0 || x_diff > virt_fw || +- y_diff < 0 || y_diff > virt_fh) { ++ if ((x_diff < 0 || x_diff > virt_fw || ++ y_diff < 0 || y_diff > virt_fh) && !vc->vc_decor.state) { + const struct fb_videomode *mode; + + DPRINTK("attempting resize %ix%i\n", var.xres, var.yres); +@@ -2167,6 +2201,21 @@ + + info = registered_fb[con2fb_map[vc->vc_num]]; + ops = info->fbcon_par; ++ prev_console = ops->currcon; ++ if (prev_console != -1) ++ old_info = registered_fb[con2fb_map[prev_console]]; ++ ++#ifdef CONFIG_FB_CON_DECOR ++ if (!fbcon_decor_active_vc(vc) && info->fix.visual == FB_VISUAL_DIRECTCOLOR) { ++ struct vc_data *vc_curr = vc_cons[prev_console].d; ++ if (vc_curr && fbcon_decor_active_vc(vc_curr)) { ++ /* Clear the screen to avoid displaying funky colors during ++ * palette updates. */ ++ memset((u8*)info->screen_base + info->fix.line_length * info->var.yoffset, ++ 0, info->var.yres * info->fix.line_length); ++ } ++ } ++#endif + + if (softback_top) { + if (softback_lines) +@@ -2185,9 +2234,6 @@ + logo_shown = FBCON_LOGO_CANSHOW; + } + +- prev_console = ops->currcon; +- if (prev_console != -1) +- old_info = registered_fb[con2fb_map[prev_console]]; + /* + * FIXME: If we have multiple fbdev's loaded, we need to + * update all info->currcon. Perhaps, we can place this +@@ -2231,6 +2277,18 @@ + fbcon_del_cursor_timer(old_info); + } + ++ if (fbcon_decor_active_vc(vc)) { ++ struct vc_data *vc_curr = vc_cons[prev_console].d; ++ ++ if (!vc_curr->vc_decor.theme || ++ strcmp(vc->vc_decor.theme, vc_curr->vc_decor.theme) || ++ (fbcon_decor_active_nores(info, vc_curr) && ++ !fbcon_decor_active(info, vc_curr))) { ++ fbcon_decor_disable(vc, 0); ++ fbcon_decor_call_helper("modechange", vc->vc_num); ++ } ++ } ++ + if (fbcon_is_inactive(vc, info) || + ops->blank_state != FB_BLANK_UNBLANK) + fbcon_del_cursor_timer(info); +@@ -2339,15 +2397,20 @@ + } + } + +- if (!fbcon_is_inactive(vc, info)) { ++ if (!fbcon_is_inactive(vc, info)) { + if (ops->blank_state != blank) { + ops->blank_state = blank; + fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW); + ops->cursor_flash = (!blank); + +- if (!(info->flags & FBINFO_MISC_USEREVENT)) +- if (fb_blank(info, blank)) +- fbcon_generic_blank(vc, info, blank); ++ if (!(info->flags & FBINFO_MISC_USEREVENT)) { ++ if (fb_blank(info, blank)) { ++ if (fbcon_decor_active(info, vc)) ++ fbcon_decor_blank(vc, info, blank); ++ else ++ fbcon_generic_blank(vc, info, blank); ++ } ++ } + } + + if (!blank) +@@ -2522,13 +2585,22 @@ + } + + if (resize) { ++ /* reset wrap/pan */ + int cols, rows; + + cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres); + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); ++ ++ if (fbcon_decor_active(info, vc)) { ++ info->var.xoffset = info->var.yoffset = p->yscroll = 0; ++ cols = vc->vc_decor.twidth; ++ rows = vc->vc_decor.theight; ++ } + cols /= w; + rows /= h; ++ + vc_resize(vc, cols, rows); ++ + if (CON_IS_VISIBLE(vc) && softback_buf) + fbcon_update_softback(vc); + } else if (CON_IS_VISIBLE(vc) +@@ -2657,7 +2729,11 @@ + int i, j, k, depth; + u8 val; + +- if (fbcon_is_inactive(vc, info)) ++ if (fbcon_is_inactive(vc, info) ++#ifdef CONFIG_FB_CON_DECOR ++ || vc->vc_num != fg_console ++#endif ++ ) + return -EINVAL; + + if (!CON_IS_VISIBLE(vc)) +@@ -2683,14 +2759,56 @@ + } else + fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap); + +- return fb_set_cmap(&palette_cmap, info); ++ if (fbcon_decor_active(info, vc_cons[fg_console].d) && ++ info->fix.visual == FB_VISUAL_DIRECTCOLOR) { ++ ++ u16 *red, *green, *blue; ++ int minlen = min(min(info->var.red.length, info->var.green.length), ++ info->var.blue.length); ++ int h; ++ ++ struct fb_cmap cmap = { ++ .start = 0, ++ .len = (1 << minlen), ++ .red = NULL, ++ .green = NULL, ++ .blue = NULL, ++ .transp = NULL ++ }; ++ ++ red = kmalloc(256 * sizeof(u16) * 3, GFP_KERNEL); ++ ++ if (!red) ++ goto out; ++ ++ green = red + 256; ++ blue = green + 256; ++ cmap.red = red; ++ cmap.green = green; ++ cmap.blue = blue; ++ ++ for (i = 0; i < cmap.len; i++) { ++ red[i] = green[i] = blue[i] = (0xffff * i)/(cmap.len-1); ++ } ++ ++ h = fb_set_cmap(&cmap, info); ++ fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d); ++ kfree(red); ++ ++ return h; ++ ++ } else if (fbcon_decor_active(info, vc_cons[fg_console].d) && ++ info->var.bits_per_pixel == 8 && info->bgdecor.cmap.red != NULL) ++ fb_set_cmap(&info->bgdecor.cmap, info); ++ ++out: return fb_set_cmap(&palette_cmap, info); + } + + static u16 *fbcon_screen_pos(struct vc_data *vc, int offset) + { + unsigned long p; + int line; +- ++ + if (vc->vc_num != fg_console || !softback_lines) + return (u16 *) (vc->vc_origin + offset); + line = offset / vc->vc_size_row; +@@ -2909,7 +3027,14 @@ + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); + cols /= vc->vc_font.width; + rows /= vc->vc_font.height; +- vc_resize(vc, cols, rows); ++ ++ if (!fbcon_decor_active_nores(info, vc)) { ++ vc_resize(vc, cols, rows); ++ } else { ++ fbcon_decor_disable(vc, 0); ++ fbcon_decor_call_helper("modechange", vc->vc_num); ++ } ++ + updatescrollmode(p, info, vc); + scrollback_max = 0; + scrollback_current = 0; +@@ -2954,7 +3079,9 @@ + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); + cols /= vc->vc_font.width; + rows /= vc->vc_font.height; +- vc_resize(vc, cols, rows); ++ if (!fbcon_decor_active_nores(info, vc)) { ++ vc_resize(vc, cols, rows); ++ } + } + + if (fg != -1) +@@ -3570,6 +3697,7 @@ + } + } + ++ fbcon_decor_exit(); + fbcon_has_exited = 1; + } + +diff -Nur linux-3.13.7.orig/drivers/video/console/fbcondecor.c linux-3.13.7/drivers/video/console/fbcondecor.c +--- linux-3.13.7.orig/drivers/video/console/fbcondecor.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.13.7/drivers/video/console/fbcondecor.c 2014-03-29 16:03:17.000000000 +0100 +@@ -0,0 +1,555 @@ ++/* ++ * linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations ++ * ++ * Copyright (C) 2004-2009 Michal Januszewski <michalj+fbcondecor@gmail.com> ++ * ++ * Code based upon "Bootsplash" (C) 2001-2003 ++ * Volker Poplawski <volker@poplawski.de>, ++ * Stefan Reinauer <stepan@suse.de>, ++ * Steffen Winterfeldt <snwint@suse.de>, ++ * Michael Schroeder <mls@suse.de>, ++ * Ken Wimer <wimer@suse.de>. ++ * ++ * Compat ioctl support by Thorsten Klein <TK@Thorsten-Klein.de>. ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive for ++ * more details. ++ * ++ */ ++#include <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/string.h> ++#include <linux/types.h> ++#include <linux/fb.h> ++#include <linux/vt_kern.h> ++#include <linux/vmalloc.h> ++#include <linux/unistd.h> ++#include <linux/syscalls.h> ++#include <linux/init.h> ++#include <linux/proc_fs.h> ++#include <linux/workqueue.h> ++#include <linux/kmod.h> ++#include <linux/miscdevice.h> ++#include <linux/device.h> ++#include <linux/fs.h> ++#include <linux/compat.h> ++#include <linux/console.h> ++ ++#include <asm/uaccess.h> ++#include <asm/irq.h> ++ ++#include "fbcon.h" ++#include "fbcondecor.h" ++ ++extern signed char con2fb_map[]; ++static int fbcon_decor_enable(struct vc_data *vc); ++char fbcon_decor_path[KMOD_PATH_LEN] = "/sbin/fbcondecor_helper"; ++static int initialized = 0; ++ ++int fbcon_decor_call_helper(char* cmd, unsigned short vc) ++{ ++ char *envp[] = { ++ "HOME=/", ++ "PATH=/sbin:/bin", ++ NULL ++ }; ++ ++ char tfb[5]; ++ char tcons[5]; ++ unsigned char fb = (int) con2fb_map[vc]; ++ ++ char *argv[] = { ++ fbcon_decor_path, ++ "2", ++ cmd, ++ tcons, ++ tfb, ++ vc_cons[vc].d->vc_decor.theme, ++ NULL ++ }; ++ ++ snprintf(tfb,5,"%d",fb); ++ snprintf(tcons,5,"%d",vc); ++ ++ return call_usermodehelper(fbcon_decor_path, argv, envp, UMH_WAIT_EXEC); ++} ++ ++/* Disables fbcondecor on a virtual console; called with console sem held. */ ++int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw) ++{ ++ struct fb_info* info; ++ ++ if (!vc->vc_decor.state) ++ return -EINVAL; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (info == NULL) ++ return -EINVAL; ++ ++ vc->vc_decor.state = 0; ++ vc_resize(vc, info->var.xres / vc->vc_font.width, ++ info->var.yres / vc->vc_font.height); ++ ++ if (fg_console == vc->vc_num && redraw) { ++ redraw_screen(vc, 0); ++ update_region(vc, vc->vc_origin + ++ vc->vc_size_row * vc->vc_top, ++ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); ++ } ++ ++ printk(KERN_INFO "fbcondecor: switched decor state to 'off' on console %d\n", ++ vc->vc_num); ++ ++ return 0; ++} ++ ++/* Enables fbcondecor on a virtual console; called with console sem held. */ ++static int fbcon_decor_enable(struct vc_data *vc) ++{ ++ struct fb_info* info; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (vc->vc_decor.twidth == 0 || vc->vc_decor.theight == 0 || ++ info == NULL || vc->vc_decor.state || (!info->bgdecor.data && ++ vc->vc_num == fg_console)) ++ return -EINVAL; ++ ++ vc->vc_decor.state = 1; ++ vc_resize(vc, vc->vc_decor.twidth / vc->vc_font.width, ++ vc->vc_decor.theight / vc->vc_font.height); ++ ++ if (fg_console == vc->vc_num) { ++ redraw_screen(vc, 0); ++ update_region(vc, vc->vc_origin + ++ vc->vc_size_row * vc->vc_top, ++ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); ++ fbcon_decor_clear_margins(vc, info, 0); ++ } ++ ++ printk(KERN_INFO "fbcondecor: switched decor state to 'on' on console %d\n", ++ vc->vc_num); ++ ++ return 0; ++} ++ ++static inline int fbcon_decor_ioctl_dosetstate(struct vc_data *vc, unsigned int state, unsigned char origin) ++{ ++ int ret; ++ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_lock(); ++ if (!state) ++ ret = fbcon_decor_disable(vc, 1); ++ else ++ ret = fbcon_decor_enable(vc); ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_unlock(); ++ ++ return ret; ++} ++ ++static inline void fbcon_decor_ioctl_dogetstate(struct vc_data *vc, unsigned int *state) ++{ ++ *state = vc->vc_decor.state; ++} ++ ++static int fbcon_decor_ioctl_dosetcfg(struct vc_data *vc, struct vc_decor *cfg, unsigned char origin) ++{ ++ struct fb_info *info; ++ int len; ++ char *tmp; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (info == NULL || !cfg->twidth || !cfg->theight || ++ cfg->tx + cfg->twidth > info->var.xres || ++ cfg->ty + cfg->theight > info->var.yres) ++ return -EINVAL; ++ ++ len = strlen_user(cfg->theme); ++ if (!len || len > FBCON_DECOR_THEME_LEN) ++ return -EINVAL; ++ tmp = kmalloc(len, GFP_KERNEL); ++ if (!tmp) ++ return -ENOMEM; ++ if (copy_from_user(tmp, (void __user *)cfg->theme, len)) ++ return -EFAULT; ++ cfg->theme = tmp; ++ cfg->state = 0; ++ ++ /* If this ioctl is a response to a request from kernel, the console sem ++ * is already held; we also don't need to disable decor because either the ++ * new config and background picture will be successfully loaded, and the ++ * decor will stay on, or in case of a failure it'll be turned off in fbcon. */ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) { ++ console_lock(); ++ if (vc->vc_decor.state) ++ fbcon_decor_disable(vc, 1); ++// } ++ ++ if (vc->vc_decor.theme) ++ kfree(vc->vc_decor.theme); ++ ++ vc->vc_decor = *cfg; ++ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_unlock(); ++ ++ printk(KERN_INFO "fbcondecor: console %d using theme '%s'\n", ++ vc->vc_num, vc->vc_decor.theme); ++ return 0; ++} ++ ++static int fbcon_decor_ioctl_dogetcfg(struct vc_data *vc, struct vc_decor *decor) ++{ ++ char __user *tmp; ++ ++ tmp = decor->theme; ++ *decor = vc->vc_decor; ++ decor->theme = tmp; ++ ++ if (vc->vc_decor.theme) { ++ if (copy_to_user(tmp, vc->vc_decor.theme, strlen(vc->vc_decor.theme) + 1)) ++ return -EFAULT; ++ } else ++ if (put_user(0, tmp)) ++ return -EFAULT; ++ ++ return 0; ++} ++ ++static int fbcon_decor_ioctl_dosetpic(struct vc_data *vc, struct fb_image *img, unsigned char origin) ++{ ++ struct fb_info *info; ++ int len; ++ u8 *tmp; ++ ++ if (vc->vc_num != fg_console) ++ return -EINVAL; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (info == NULL) ++ return -EINVAL; ++ ++ if (img->width != info->var.xres || img->height != info->var.yres) { ++ printk(KERN_ERR "fbcondecor: picture dimensions mismatch\n"); ++ printk(KERN_ERR "%dx%d vs %dx%d\n", img->width, img->height, info->var.xres, info->var.yres); ++ return -EINVAL; ++ } ++ ++ if (img->depth != info->var.bits_per_pixel) { ++ printk(KERN_ERR "fbcondecor: picture depth mismatch\n"); ++ return -EINVAL; ++ } ++ ++ if (img->depth == 8) { ++ if (!img->cmap.len || !img->cmap.red || !img->cmap.green || ++ !img->cmap.blue) ++ return -EINVAL; ++ ++ tmp = vmalloc(img->cmap.len * 3 * 2); ++ if (!tmp) ++ return -ENOMEM; ++ ++ if (copy_from_user(tmp, ++ (void __user*)img->cmap.red, (img->cmap.len << 1)) || ++ copy_from_user(tmp + (img->cmap.len << 1), ++ (void __user*)img->cmap.green, (img->cmap.len << 1)) || ++ copy_from_user(tmp + (img->cmap.len << 2), ++ (void __user*)img->cmap.blue, (img->cmap.len << 1))) { ++ vfree(tmp); ++ return -EFAULT; ++ } ++ ++ img->cmap.transp = NULL; ++ img->cmap.red = (u16*)tmp; ++ img->cmap.green = img->cmap.red + img->cmap.len; ++ img->cmap.blue = img->cmap.green + img->cmap.len; ++ } else { ++ img->cmap.red = NULL; ++ } ++ ++ len = ((img->depth + 7) >> 3) * img->width * img->height; ++ ++ /* ++ * Allocate an additional byte so that we never go outside of the ++ * buffer boundaries in the rendering functions in a 24 bpp mode. ++ */ ++ tmp = vmalloc(len + 1); ++ ++ if (!tmp) ++ goto out; ++ ++ if (copy_from_user(tmp, (void __user*)img->data, len)) ++ goto out; ++ ++ img->data = tmp; ++ ++ /* If this ioctl is a response to a request from kernel, the console sem ++ * is already held. */ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_lock(); ++ ++ if (info->bgdecor.data) ++ vfree((u8*)info->bgdecor.data); ++ if (info->bgdecor.cmap.red) ++ vfree(info->bgdecor.cmap.red); ++ ++ info->bgdecor = *img; ++ ++ if (fbcon_decor_active_vc(vc) && fg_console == vc->vc_num) { ++ redraw_screen(vc, 0); ++ update_region(vc, vc->vc_origin + ++ vc->vc_size_row * vc->vc_top, ++ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); ++ fbcon_decor_clear_margins(vc, info, 0); ++ } ++ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_unlock(); ++ ++ return 0; ++ ++out: if (img->cmap.red) ++ vfree(img->cmap.red); ++ ++ if (tmp) ++ vfree(tmp); ++ return -ENOMEM; ++} ++ ++static long fbcon_decor_ioctl(struct file *filp, u_int cmd, u_long arg) ++{ ++ struct fbcon_decor_iowrapper __user *wrapper = (void __user*) arg; ++ struct vc_data *vc = NULL; ++ unsigned short vc_num = 0; ++ unsigned char origin = 0; ++ void __user *data = NULL; ++ ++ if (!access_ok(VERIFY_READ, wrapper, ++ sizeof(struct fbcon_decor_iowrapper))) ++ return -EFAULT; ++ ++ __get_user(vc_num, &wrapper->vc); ++ __get_user(origin, &wrapper->origin); ++ __get_user(data, &wrapper->data); ++ ++ if (!vc_cons_allocated(vc_num)) ++ return -EINVAL; ++ ++ vc = vc_cons[vc_num].d; ++ ++ switch (cmd) { ++ case FBIOCONDECOR_SETPIC: ++ { ++ struct fb_image img; ++ if (copy_from_user(&img, (struct fb_image __user *)data, sizeof(struct fb_image))) ++ return -EFAULT; ++ ++ return fbcon_decor_ioctl_dosetpic(vc, &img, origin); ++ } ++ case FBIOCONDECOR_SETCFG: ++ { ++ struct vc_decor cfg; ++ if (copy_from_user(&cfg, (struct vc_decor __user *)data, sizeof(struct vc_decor))) ++ return -EFAULT; ++ ++ return fbcon_decor_ioctl_dosetcfg(vc, &cfg, origin); ++ } ++ case FBIOCONDECOR_GETCFG: ++ { ++ int rval; ++ struct vc_decor cfg; ++ ++ if (copy_from_user(&cfg, (struct vc_decor __user *)data, sizeof(struct vc_decor))) ++ return -EFAULT; ++ ++ rval = fbcon_decor_ioctl_dogetcfg(vc, &cfg); ++ ++ if (copy_to_user(data, &cfg, sizeof(struct vc_decor))) ++ return -EFAULT; ++ return rval; ++ } ++ case FBIOCONDECOR_SETSTATE: ++ { ++ unsigned int state = 0; ++ if (get_user(state, (unsigned int __user *)data)) ++ return -EFAULT; ++ return fbcon_decor_ioctl_dosetstate(vc, state, origin); ++ } ++ case FBIOCONDECOR_GETSTATE: ++ { ++ unsigned int state = 0; ++ fbcon_decor_ioctl_dogetstate(vc, &state); ++ return put_user(state, (unsigned int __user *)data); ++ } ++ ++ default: ++ return -ENOIOCTLCMD; ++ } ++} ++ ++#ifdef CONFIG_COMPAT ++ ++static long fbcon_decor_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { ++ ++ struct fbcon_decor_iowrapper32 __user *wrapper = (void __user *)arg; ++ struct vc_data *vc = NULL; ++ unsigned short vc_num = 0; ++ unsigned char origin = 0; ++ compat_uptr_t data_compat = 0; ++ void __user *data = NULL; ++ ++ if (!access_ok(VERIFY_READ, wrapper, ++ sizeof(struct fbcon_decor_iowrapper32))) ++ return -EFAULT; ++ ++ __get_user(vc_num, &wrapper->vc); ++ __get_user(origin, &wrapper->origin); ++ __get_user(data_compat, &wrapper->data); ++ data = compat_ptr(data_compat); ++ ++ if (!vc_cons_allocated(vc_num)) ++ return -EINVAL; ++ ++ vc = vc_cons[vc_num].d; ++ ++ switch (cmd) { ++ case FBIOCONDECOR_SETPIC32: ++ { ++ struct fb_image32 img_compat; ++ struct fb_image img; ++ ++ if (copy_from_user(&img_compat, (struct fb_image32 __user *)data, sizeof(struct fb_image32))) ++ return -EFAULT; ++ ++ fb_image_from_compat(img, img_compat); ++ ++ return fbcon_decor_ioctl_dosetpic(vc, &img, origin); ++ } ++ ++ case FBIOCONDECOR_SETCFG32: ++ { ++ struct vc_decor32 cfg_compat; ++ struct vc_decor cfg; ++ ++ if (copy_from_user(&cfg_compat, (struct vc_decor32 __user *)data, sizeof(struct vc_decor32))) ++ return -EFAULT; ++ ++ vc_decor_from_compat(cfg, cfg_compat); ++ ++ return fbcon_decor_ioctl_dosetcfg(vc, &cfg, origin); ++ } ++ ++ case FBIOCONDECOR_GETCFG32: ++ { ++ int rval; ++ struct vc_decor32 cfg_compat; ++ struct vc_decor cfg; ++ ++ if (copy_from_user(&cfg_compat, (struct vc_decor32 __user *)data, sizeof(struct vc_decor32))) ++ return -EFAULT; ++ cfg.theme = compat_ptr(cfg_compat.theme); ++ ++ rval = fbcon_decor_ioctl_dogetcfg(vc, &cfg); ++ ++ vc_decor_to_compat(cfg_compat, cfg); ++ ++ if (copy_to_user((struct vc_decor32 __user *)data, &cfg_compat, sizeof(struct vc_decor32))) ++ return -EFAULT; ++ return rval; ++ } ++ ++ case FBIOCONDECOR_SETSTATE32: ++ { ++ compat_uint_t state_compat = 0; ++ unsigned int state = 0; ++ ++ if (get_user(state_compat, (compat_uint_t __user *)data)) ++ return -EFAULT; ++ ++ state = (unsigned int)state_compat; ++ ++ return fbcon_decor_ioctl_dosetstate(vc, state, origin); ++ } ++ ++ case FBIOCONDECOR_GETSTATE32: ++ { ++ compat_uint_t state_compat = 0; ++ unsigned int state = 0; ++ ++ fbcon_decor_ioctl_dogetstate(vc, &state); ++ state_compat = (compat_uint_t)state; ++ ++ return put_user(state_compat, (compat_uint_t __user *)data); ++ } ++ ++ default: ++ return -ENOIOCTLCMD; ++ } ++} ++#else ++ #define fbcon_decor_compat_ioctl NULL ++#endif ++ ++static struct file_operations fbcon_decor_ops = { ++ .owner = THIS_MODULE, ++ .unlocked_ioctl = fbcon_decor_ioctl, ++ .compat_ioctl = fbcon_decor_compat_ioctl ++}; ++ ++static struct miscdevice fbcon_decor_dev = { ++ .minor = MISC_DYNAMIC_MINOR, ++ .name = "fbcondecor", ++ .fops = &fbcon_decor_ops ++}; ++ ++void fbcon_decor_reset() ++{ ++ int i; ++ ++ for (i = 0; i < num_registered_fb; i++) { ++ registered_fb[i]->bgdecor.data = NULL; ++ registered_fb[i]->bgdecor.cmap.red = NULL; ++ } ++ ++ for (i = 0; i < MAX_NR_CONSOLES && vc_cons[i].d; i++) { ++ vc_cons[i].d->vc_decor.state = vc_cons[i].d->vc_decor.twidth = ++ vc_cons[i].d->vc_decor.theight = 0; ++ vc_cons[i].d->vc_decor.theme = NULL; ++ } ++ ++ return; ++} ++ ++int fbcon_decor_init() ++{ ++ int i; ++ ++ fbcon_decor_reset(); ++ ++ if (initialized) ++ return 0; ++ ++ i = misc_register(&fbcon_decor_dev); ++ if (i) { ++ printk(KERN_ERR "fbcondecor: failed to register device\n"); ++ return i; ++ } ++ ++ fbcon_decor_call_helper("init", 0); ++ initialized = 1; ++ return 0; ++} ++ ++int fbcon_decor_exit(void) ++{ ++ fbcon_decor_reset(); ++ return 0; ++} ++ ++EXPORT_SYMBOL(fbcon_decor_path); +diff -Nur linux-3.13.7.orig/drivers/video/console/fbcondecor.h linux-3.13.7/drivers/video/console/fbcondecor.h +--- linux-3.13.7.orig/drivers/video/console/fbcondecor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.13.7/drivers/video/console/fbcondecor.h 2014-03-29 21:17:27.000000000 +0100 +@@ -0,0 +1,79 @@ ++/* ++ * linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers ++ * ++ * Copyright (C) 2004 Michal Januszewski <michalj+fbcondecor@gmail.com> ++ * ++ */ ++ ++#ifndef __FBCON_DECOR_H ++#define __FBCON_DECOR_H ++ ++#ifndef _LINUX_FB_H ++#include <linux/fb.h> ++#endif ++ ++/* This is needed for vc_cons in fbcmap.c */ ++#include <linux/vt_kern.h> ++ ++struct fb_cursor; ++struct fb_info; ++struct vc_data; ++ ++#ifdef CONFIG_FB_CON_DECOR ++/* fbcondecor.c */ ++int fbcon_decor_init(void); ++void fbcon_decor_reset(void); ++int fbcon_decor_exit(void); ++int fbcon_decor_call_helper(char* cmd, unsigned short cons); ++int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw); ++ ++/* cfbcondecor.c */ ++void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, const unsigned short *s, int count, int yy, int xx); ++void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor); ++void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, int height, int width); ++void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, int bottom_only); ++void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank); ++void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, int sx, int dx, int width); ++void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes, int srclinesbytes, int bpp); ++void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc); ++ ++/* vt.c */ ++void acquire_console_sem(void); ++void release_console_sem(void); ++void do_unblank_screen(int entering_gfx); ++ ++/* struct vc_data *y */ ++#define fbcon_decor_active_vc(y) (y->vc_decor.state && y->vc_decor.theme) ++ ++/* struct fb_info *x, struct vc_data *y */ ++#define fbcon_decor_active_nores(x,y) (x->bgdecor.data && fbcon_decor_active_vc(y)) ++ ++/* struct fb_info *x, struct vc_data *y */ ++#define fbcon_decor_active(x,y) (fbcon_decor_active_nores(x,y) && \ ++ x->bgdecor.width == x->var.xres && \ ++ x->bgdecor.height == x->var.yres && \ ++ x->bgdecor.depth == x->var.bits_per_pixel) ++ ++ ++#else /* CONFIG_FB_CON_DECOR */ ++ ++static inline void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, const unsigned short *s, int count, int yy, int xx) {} ++static inline void fbcon_decor_putc(struct vc_data *vc, struct fb_info *info, int c, int ypos, int xpos) {} ++static inline void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor) {} ++static inline void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, int height, int width) {} ++static inline void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, int bottom_only) {} ++static inline void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank) {} ++static inline void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, int sx, int dx, int width) {} ++static inline void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc) {} ++static inline int fbcon_decor_call_helper(char* cmd, unsigned short cons) { return 0; } ++static inline int fbcon_decor_init(void) { return 0; } ++static inline int fbcon_decor_exit(void) { return 0; } ++static inline int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw) { return 0; } ++ ++#define fbcon_decor_active_vc(y) (0) ++#define fbcon_decor_active_nores(x,y) (0) ++#define fbcon_decor_active(x,y) (0) ++ ++#endif /* CONFIG_FB_CON_DECOR */ ++ ++#endif /* __FBCON_DECOR_H */ +diff -Nur linux-3.13.7.orig/drivers/video/fbcmap.c linux-3.13.7/drivers/video/fbcmap.c +--- linux-3.13.7.orig/drivers/video/fbcmap.c 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/video/fbcmap.c 2014-03-29 16:03:17.000000000 +0100 +@@ -17,6 +17,8 @@ + #include <linux/slab.h> + #include <linux/uaccess.h> + ++#include "console/fbcondecor.h" ++ + static u16 red2[] __read_mostly = { + 0x0000, 0xaaaa + }; +@@ -249,14 +251,17 @@ + if (transp) + htransp = *transp++; + if (info->fbops->fb_setcolreg(start++, +- hred, hgreen, hblue, ++ hred, hgreen, hblue, + htransp, info)) + break; + } + } +- if (rc == 0) ++ if (rc == 0) { + fb_copy_cmap(cmap, &info->cmap); +- ++ if (fbcon_decor_active(info, vc_cons[fg_console].d) && ++ info->fix.visual == FB_VISUAL_DIRECTCOLOR) ++ fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d); ++ } + return rc; + } + +diff -Nur linux-3.13.7.orig/drivers/video/fbmem.c linux-3.13.7/drivers/video/fbmem.c +--- linux-3.13.7.orig/drivers/video/fbmem.c 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/drivers/video/fbmem.c 2014-03-29 16:03:17.000000000 +0100 +@@ -1250,15 +1250,6 @@ + u16 reserved[3]; + }; + +-struct fb_cmap32 { +- u32 start; +- u32 len; +- compat_caddr_t red; +- compat_caddr_t green; +- compat_caddr_t blue; +- compat_caddr_t transp; +-}; +- + static int fb_getput_cmap(struct fb_info *info, unsigned int cmd, + unsigned long arg) + { +diff -Nur linux-3.13.7.orig/include/linux/console_decor.h linux-3.13.7/include/linux/console_decor.h +--- linux-3.13.7.orig/include/linux/console_decor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.13.7/include/linux/console_decor.h 2014-03-29 16:03:17.000000000 +0100 +@@ -0,0 +1,46 @@ ++#ifndef _LINUX_CONSOLE_DECOR_H_ ++#define _LINUX_CONSOLE_DECOR_H_ 1 ++ ++/* A structure used by the framebuffer console decorations (drivers/video/console/fbcondecor.c) */ ++struct vc_decor { ++ __u8 bg_color; /* The color that is to be treated as transparent */ ++ __u8 state; /* Current decor state: 0 = off, 1 = on */ ++ __u16 tx, ty; /* Top left corner coordinates of the text field */ ++ __u16 twidth, theight; /* Width and height of the text field */ ++ char* theme; ++}; ++ ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++#include <linux/compat.h> ++ ++struct vc_decor32 { ++ __u8 bg_color; /* The color that is to be treated as transparent */ ++ __u8 state; /* Current decor state: 0 = off, 1 = on */ ++ __u16 tx, ty; /* Top left corner coordinates of the text field */ ++ __u16 twidth, theight; /* Width and height of the text field */ ++ compat_uptr_t theme; ++}; ++ ++#define vc_decor_from_compat(to, from) \ ++ (to).bg_color = (from).bg_color; \ ++ (to).state = (from).state; \ ++ (to).tx = (from).tx; \ ++ (to).ty = (from).ty; \ ++ (to).twidth = (from).twidth; \ ++ (to).theight = (from).theight; \ ++ (to).theme = compat_ptr((from).theme) ++ ++#define vc_decor_to_compat(to, from) \ ++ (to).bg_color = (from).bg_color; \ ++ (to).state = (from).state; \ ++ (to).tx = (from).tx; \ ++ (to).ty = (from).ty; \ ++ (to).twidth = (from).twidth; \ ++ (to).theight = (from).theight; \ ++ (to).theme = ptr_to_compat((from).theme) ++ ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ ++#endif +diff -Nur linux-3.13.7.orig/include/linux/console_struct.h linux-3.13.7/include/linux/console_struct.h +--- linux-3.13.7.orig/include/linux/console_struct.h 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/include/linux/console_struct.h 2014-03-29 16:03:17.000000000 +0100 +@@ -19,6 +19,7 @@ + struct vt_struct; + + #define NPAR 16 ++#include <linux/console_decor.h> + + struct vc_data { + struct tty_port port; /* Upper level data */ +@@ -107,6 +108,8 @@ + unsigned long vc_uni_pagedir; + unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ + bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */ ++ ++ struct vc_decor vc_decor; + /* additional information is in vt_kern.h */ + }; + +diff -Nur linux-3.13.7.orig/include/linux/fb.h linux-3.13.7/include/linux/fb.h +--- linux-3.13.7.orig/include/linux/fb.h 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/include/linux/fb.h 2014-03-29 16:03:17.000000000 +0100 +@@ -219,6 +219,34 @@ + }; + #endif + ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++struct fb_image32 { ++ __u32 dx; /* Where to place image */ ++ __u32 dy; ++ __u32 width; /* Size of image */ ++ __u32 height; ++ __u32 fg_color; /* Only used when a mono bitmap */ ++ __u32 bg_color; ++ __u8 depth; /* Depth of the image */ ++ const compat_uptr_t data; /* Pointer to image data */ ++ struct fb_cmap32 cmap; /* color map info */ ++}; ++ ++#define fb_image_from_compat(to, from) \ ++ (to).dx = (from).dx; \ ++ (to).dy = (from).dy; \ ++ (to).width = (from).width; \ ++ (to).height = (from).height; \ ++ (to).fg_color = (from).fg_color; \ ++ (to).bg_color = (from).bg_color; \ ++ (to).depth = (from).depth; \ ++ (to).data = compat_ptr((from).data); \ ++ fb_cmap_from_compat((to).cmap, (from).cmap) ++ ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ + /* + * Frame buffer operations + * +@@ -489,6 +517,9 @@ + #define FBINFO_STATE_SUSPENDED 1 + u32 state; /* Hardware state i.e suspend */ + void *fbcon_par; /* fbcon use-only private area */ ++ ++ struct fb_image bgdecor; ++ + /* From here on everything is device dependent */ + void *par; + /* we need the PCI or similar aperture base/size not +diff -Nur linux-3.13.7.orig/include/uapi/linux/fb.h linux-3.13.7/include/uapi/linux/fb.h +--- linux-3.13.7.orig/include/uapi/linux/fb.h 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/include/uapi/linux/fb.h 2014-03-29 16:03:17.000000000 +0100 +@@ -8,6 +8,25 @@ + + #define FB_MAX 32 /* sufficient for now */ + ++struct fbcon_decor_iowrapper ++{ ++ unsigned short vc; /* Virtual console */ ++ unsigned char origin; /* Point of origin of the request */ ++ void *data; ++}; ++ ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++#include <linux/compat.h> ++struct fbcon_decor_iowrapper32 ++{ ++ unsigned short vc; /* Virtual console */ ++ unsigned char origin; /* Point of origin of the request */ ++ compat_uptr_t data; ++}; ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ + /* ioctls + 0x46 is 'F' */ + #define FBIOGET_VSCREENINFO 0x4600 +@@ -35,6 +54,25 @@ + #define FBIOGET_DISPINFO 0x4618 + #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) + ++#define FBIOCONDECOR_SETCFG _IOWR('F', 0x19, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_GETCFG _IOR('F', 0x1A, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_SETSTATE _IOWR('F', 0x1B, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_GETSTATE _IOR('F', 0x1C, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_SETPIC _IOWR('F', 0x1D, struct fbcon_decor_iowrapper) ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++#define FBIOCONDECOR_SETCFG32 _IOWR('F', 0x19, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_GETCFG32 _IOR('F', 0x1A, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_SETSTATE32 _IOWR('F', 0x1B, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_GETSTATE32 _IOR('F', 0x1C, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_SETPIC32 _IOWR('F', 0x1D, struct fbcon_decor_iowrapper32) ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ ++#define FBCON_DECOR_THEME_LEN 128 /* Maximum lenght of a theme name */ ++#define FBCON_DECOR_IO_ORIG_KERNEL 0 /* Kernel ioctl origin */ ++#define FBCON_DECOR_IO_ORIG_USER 1 /* User ioctl origin */ ++ + #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ + #define FB_TYPE_PLANES 1 /* Non interleaved planes */ + #define FB_TYPE_INTERLEAVED_PLANES 2 /* Interleaved planes */ +@@ -277,6 +315,29 @@ + __u32 reserved[4]; /* Reserved for future compatibility */ + }; + ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++struct fb_cmap32 { ++ __u32 start; ++ __u32 len; /* Number of entries */ ++ compat_uptr_t red; /* Red values */ ++ compat_uptr_t green; ++ compat_uptr_t blue; ++ compat_uptr_t transp; /* transparency, can be NULL */ ++}; ++ ++#define fb_cmap_from_compat(to, from) \ ++ (to).start = (from).start; \ ++ (to).len = (from).len; \ ++ (to).red = compat_ptr((from).red); \ ++ (to).green = compat_ptr((from).green); \ ++ (to).blue = compat_ptr((from).blue); \ ++ (to).transp = compat_ptr((from).transp) ++ ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ ++ + struct fb_cmap { + __u32 start; /* First entry */ + __u32 len; /* Number of entries */ +diff -Nur linux-3.13.7.orig/kernel/sysctl.c linux-3.13.7/kernel/sysctl.c +--- linux-3.13.7.orig/kernel/sysctl.c 2014-03-24 05:45:42.000000000 +0100 ++++ linux-3.13.7/kernel/sysctl.c 2014-03-29 16:03:17.000000000 +0100 +@@ -143,6 +143,10 @@ + static int ngroups_max = NGROUPS_MAX; + static const int cap_last_cap = CAP_LAST_CAP; + ++#ifdef CONFIG_FB_CON_DECOR ++extern char fbcon_decor_path[]; ++#endif ++ + #ifdef CONFIG_INOTIFY_USER + #include <linux/inotify.h> + #endif +@@ -252,6 +256,15 @@ + .mode = 0555, + .child = dev_table, + }, ++#ifdef CONFIG_FB_CON_DECOR ++ { ++ .procname = "fbcondecor", ++ .data = &fbcon_decor_path, ++ .maxlen = KMOD_PATH_LEN, ++ .mode = 0644, ++ .proc_handler = &proc_dostring, ++ }, ++#endif + { } + }; + diff --git a/target/linux/patches/3.13.6/gemalto.patch b/target/linux/patches/3.13.7/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.13.6/gemalto.patch +++ b/target/linux/patches/3.13.7/gemalto.patch diff --git a/target/linux/patches/3.13.6/lemote-rfkill.patch b/target/linux/patches/3.13.7/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.13.6/lemote-rfkill.patch +++ b/target/linux/patches/3.13.7/lemote-rfkill.patch diff --git a/target/linux/patches/3.13.6/microblaze-axi.patch b/target/linux/patches/3.13.7/microblaze-axi.patch index 1a4b17d8c..1a4b17d8c 100644 --- a/target/linux/patches/3.13.6/microblaze-axi.patch +++ b/target/linux/patches/3.13.7/microblaze-axi.patch diff --git a/target/linux/patches/3.13.6/microblaze-early-printk.patch b/target/linux/patches/3.13.7/microblaze-early-printk.patch index 92027cea1..92027cea1 100644 --- a/target/linux/patches/3.13.6/microblaze-early-printk.patch +++ b/target/linux/patches/3.13.7/microblaze-early-printk.patch diff --git a/target/linux/patches/3.13.6/microblaze-ethernet.patch b/target/linux/patches/3.13.7/microblaze-ethernet.patch index 742ab477e..742ab477e 100644 --- a/target/linux/patches/3.13.6/microblaze-ethernet.patch +++ b/target/linux/patches/3.13.7/microblaze-ethernet.patch diff --git a/target/linux/patches/3.13.6/microblaze-setup.patch b/target/linux/patches/3.13.7/microblaze-setup.patch index 43815f274..43815f274 100644 --- a/target/linux/patches/3.13.6/microblaze-setup.patch +++ b/target/linux/patches/3.13.7/microblaze-setup.patch diff --git a/target/linux/patches/3.13.6/mtd-rootfs.patch b/target/linux/patches/3.13.7/mtd-rootfs.patch index 775d5fc80..775d5fc80 100644 --- a/target/linux/patches/3.13.6/mtd-rootfs.patch +++ b/target/linux/patches/3.13.7/mtd-rootfs.patch diff --git a/target/linux/patches/3.13.6/non-static.patch b/target/linux/patches/3.13.7/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.13.6/non-static.patch +++ b/target/linux/patches/3.13.7/non-static.patch diff --git a/target/linux/patches/3.13.6/ppc64-missing-zlib.patch b/target/linux/patches/3.13.7/ppc64-missing-zlib.patch index c6e0616be..c6e0616be 100644 --- a/target/linux/patches/3.13.6/ppc64-missing-zlib.patch +++ b/target/linux/patches/3.13.7/ppc64-missing-zlib.patch diff --git a/target/linux/patches/3.13.6/ppc64-missing_arch_random.patch b/target/linux/patches/3.13.7/ppc64-missing_arch_random.patch index b341a7be5..b341a7be5 100644 --- a/target/linux/patches/3.13.6/ppc64-missing_arch_random.patch +++ b/target/linux/patches/3.13.7/ppc64-missing_arch_random.patch diff --git a/target/linux/patches/3.13.6/raspberry.patch b/target/linux/patches/3.13.7/raspberry.patch index 1e2050a44..1e2050a44 100644 --- a/target/linux/patches/3.13.6/raspberry.patch +++ b/target/linux/patches/3.13.7/raspberry.patch diff --git a/target/linux/patches/3.13.6/startup.patch b/target/linux/patches/3.13.7/startup.patch index d396b75e4..d396b75e4 100644 --- a/target/linux/patches/3.13.6/startup.patch +++ b/target/linux/patches/3.13.7/startup.patch diff --git a/target/linux/patches/3.13.6/uuid.patch b/target/linux/patches/3.13.7/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.13.6/uuid.patch +++ b/target/linux/patches/3.13.7/uuid.patch diff --git a/target/linux/patches/3.13.6/vga-cons-default-off.patch b/target/linux/patches/3.13.7/vga-cons-default-off.patch index 08a57f783..08a57f783 100644 --- a/target/linux/patches/3.13.6/vga-cons-default-off.patch +++ b/target/linux/patches/3.13.7/vga-cons-default-off.patch diff --git a/target/linux/patches/3.13.6/wlan-cf.patch b/target/linux/patches/3.13.7/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.13.6/wlan-cf.patch +++ b/target/linux/patches/3.13.7/wlan-cf.patch diff --git a/target/linux/patches/3.13.6/xargs.patch b/target/linux/patches/3.13.7/xargs.patch index 2c7b3df59..2c7b3df59 100644 --- a/target/linux/patches/3.13.6/xargs.patch +++ b/target/linux/patches/3.13.7/xargs.patch diff --git a/target/linux/patches/3.13.6/zlib-inflate.patch b/target/linux/patches/3.13.7/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.13.6/zlib-inflate.patch +++ b/target/linux/patches/3.13.7/zlib-inflate.patch diff --git a/target/linux/patches/3.4.82/bsd-compatibility.patch b/target/linux/patches/3.4.84/bsd-compatibility.patch index 9e91a62de..9e91a62de 100644 --- a/target/linux/patches/3.4.82/bsd-compatibility.patch +++ b/target/linux/patches/3.4.84/bsd-compatibility.patch diff --git a/target/linux/patches/3.4.82/defaults.patch b/target/linux/patches/3.4.84/defaults.patch index 58aae610b..58aae610b 100644 --- a/target/linux/patches/3.4.82/defaults.patch +++ b/target/linux/patches/3.4.84/defaults.patch diff --git a/target/linux/patches/3.4.82/gemalto.patch b/target/linux/patches/3.4.84/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.4.82/gemalto.patch +++ b/target/linux/patches/3.4.84/gemalto.patch diff --git a/target/linux/patches/3.4.82/lemote-rfkill.patch b/target/linux/patches/3.4.84/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.4.82/lemote-rfkill.patch +++ b/target/linux/patches/3.4.84/lemote-rfkill.patch diff --git a/target/linux/patches/3.4.82/mips-error.patch b/target/linux/patches/3.4.84/mips-error.patch index 800abc80d..800abc80d 100644 --- a/target/linux/patches/3.4.82/mips-error.patch +++ b/target/linux/patches/3.4.84/mips-error.patch diff --git a/target/linux/patches/3.4.82/module-alloc-size-check.patch b/target/linux/patches/3.4.84/module-alloc-size-check.patch index a792ac60a..a792ac60a 100644 --- a/target/linux/patches/3.4.82/module-alloc-size-check.patch +++ b/target/linux/patches/3.4.84/module-alloc-size-check.patch diff --git a/target/linux/patches/3.4.82/non-static.patch b/target/linux/patches/3.4.84/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.4.82/non-static.patch +++ b/target/linux/patches/3.4.84/non-static.patch diff --git a/target/linux/patches/3.4.82/sparc-include.patch b/target/linux/patches/3.4.84/sparc-include.patch index 2f8ffd061..2f8ffd061 100644 --- a/target/linux/patches/3.4.82/sparc-include.patch +++ b/target/linux/patches/3.4.84/sparc-include.patch diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.84/startup.patch index c26430bcb..c26430bcb 100644 --- a/target/linux/patches/3.4.82/startup.patch +++ b/target/linux/patches/3.4.84/startup.patch diff --git a/target/linux/patches/3.4.82/usb-defaults-off.patch b/target/linux/patches/3.4.84/usb-defaults-off.patch index 31367108a..31367108a 100644 --- a/target/linux/patches/3.4.82/usb-defaults-off.patch +++ b/target/linux/patches/3.4.84/usb-defaults-off.patch diff --git a/target/linux/patches/3.4.82/uuid.patch b/target/linux/patches/3.4.84/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.4.82/uuid.patch +++ b/target/linux/patches/3.4.84/uuid.patch diff --git a/target/linux/patches/3.4.82/vga-cons-default-off.patch b/target/linux/patches/3.4.84/vga-cons-default-off.patch index 178aeeeb9..178aeeeb9 100644 --- a/target/linux/patches/3.4.82/vga-cons-default-off.patch +++ b/target/linux/patches/3.4.84/vga-cons-default-off.patch diff --git a/target/linux/patches/3.4.82/wlan-cf.patch b/target/linux/patches/3.4.84/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.4.82/wlan-cf.patch +++ b/target/linux/patches/3.4.84/wlan-cf.patch diff --git a/target/linux/patches/3.4.82/zlib-inflate.patch b/target/linux/patches/3.4.84/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.4.82/zlib-inflate.patch +++ b/target/linux/patches/3.4.84/zlib-inflate.patch diff --git a/target/m68k/Makefile b/target/m68k/Makefile index 0e7324c25..78206042c 100644 --- a/target/m68k/Makefile +++ b/target/m68k/Makefile @@ -26,6 +26,14 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' +ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y) + @sed -e "s#@@KERNEL@@#$(FW_DIR)/$(TARGET_KERNEL)#" \ + -e "s#@@INITRAMFS@@#${FW_DIR}/${INITRAMFS}#" \ + $(TOPDIR)/target/m68k/aranym.cfg.in \ + > $(TOPDIR)/target/m68k/aranym.cfg + @echo 'Start aranym with: aranym-mmu -l -c target/m68k/aranym.cfg' + @echo 'Ungrab mouse with middle mouse click' +endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs diff --git a/target/m68k/aranym.cfg.in b/target/m68k/aranym.cfg.in new file mode 100644 index 000000000..a2fd30170 --- /dev/null +++ b/target/m68k/aranym.cfg.in @@ -0,0 +1,195 @@ +[GLOBAL] +FastRAM = 32 +Floppy = +TOS = ROM +EmuTOS = etos512k.img +Bootstrap = mintara.prg +BootstrapArgs = +BootDrive = +GMTime = No + +[STARTUP] +GrabMouse = No +Debugger = No + +[IKBD] +WheelEiffel = No +AltGr = Yes + +[HOTKEYS] +Setup = 19:0 +Quit = 19:0x1 +Reboot = 19:0x40 +Ungrab = 27:0x141 +Debug = 19:0x100 +Screenshot = 316:0 +Fullscreen = 302:0 + +[JIT] +JIT = Yes +JITFPU = Yes +JITCacheSize = 8192 +JITLazyFlush = 1 +JITBlackList = +JITInline = No + +[VIDEO] +FullScreen = No +BootColorDepth = -1 +VidelRefresh = 2 +VidelMonitor = -1 +SingleBlitComposing = No +SingleBlitRefresh = No + +[TOS] +Cookie_MCH = 50000 +RedirConsole = No + +[IDE0] +Present = No +IsCDROM = No +ByteSwap = No +ReadOnly = No +Path = +Cylinders = 0 +Heads = 0 +SectorsPerTrack = 0 +ModelName = Master + +[IDE1] +Present = No +IsCDROM = No +ByteSwap = No +ReadOnly = No +Path = +Cylinders = 0 +Heads = 0 +SectorsPerTrack = 0 +ModelName = Slave + +[PARTITION0] +Path = +Present = No +PartID = BGM +ByteSwap = No +ReadOnly = No + +[HOSTFS] +A = +B = +C = +D = +E = +F = +G = +H = +I = +J = +K = +L = +M = +N = +O = +P = +Q = +R = +S = +T = +U = +V = +W = +X = +Y = +Z = + +[OPENGL] +Enabled = No +Filtered = No +Library = + +[ETH0] +Type = bridge +Tunnel = tap0 +HostIP = 172.24.30.12 +AtariIP = 172.24.42.46 +Netmask = 255.255.0.0 +MAC = 00:41:45:54:48:30 + +[LILO] +Kernel = @@KERNEL@@ +Args = console=tty debug=par +Ramdisk = @@INITRAMFS@@ + +[MIDI] +Type = none +File = +Sequencer = /dev/sequencer + +[CDROMS] +A = -1 +B = -1 +C = -1 +D = -1 +E = -1 +F = -1 +G = -1 +H = -1 +I = -1 +J = -1 +K = -1 +L = -1 +M = -1 +N = -1 +O = -1 +P = -1 +Q = -1 +R = -1 +S = -1 +T = -1 +U = -1 +V = -1 +W = -1 +X = -1 +Y = -1 +Z = -1 + +[AUTOZOOM] +Enabled = No +IntegerCoefs = No +FixedSize = No +Width = 640 +Height = 480 + +[NFOSMESA] +ChannelSize = 0 +LibGL = libGL.so +LibOSMesa = libOSMesa.so + +[PARALLEL] +Type = file +File = stderr +Parport = /dev/parport0 + +[SERIAL] +Serport = /dev/ttyS0 + +[NATFEATS] +CDROM = sdl +Vdi = soft + +[NFVDI] +UseHostMouseCursor = No + +[AUDIO] +Frequency = 22050 +Channels = 2 +Bits = 16 +Samples = 1024 + +[JOYSTICKS] +Ikbd0 = -1 +Ikbd1 = 0 +JoypadA = -1 +JoypadAButtons = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +JoypadB = -1 +JoypadBButtons = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k index 93bf0022f..ac513fdc6 100644 --- a/target/m68k/kernel/aranym-m68k +++ b/target/m68k/kernel/aranym-m68k @@ -4,12 +4,8 @@ CONFIG_M68KCLASSIC=y CONFIG_M68040=y CONFIG_FPU=y CONFIG_ATARI=y -CONFIG_NET_VENDOR_AMD=y -CONFIG_NET_CADENCE=y +CONFIG_NATFEAT=y +CONFIG_NFETH=y CONFIG_SERIO=y CONFIG_SERIO_SERPORT=y CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k index 0bc27683b..b48c9b784 100644 --- a/target/m68k/sys-available/toolchain-m68k +++ b/target/m68k/sys-available/toolchain-m68k @@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K select ADK_m68k select ADK_toolchain_m68k select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a m68k toolchain. diff --git a/target/m68k/target.mk b/target/m68k/target.mk index 1460b732b..80b1424a6 100644 --- a/target/m68k/target.mk +++ b/target/m68k/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= m68k CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 5ab2345e7..4a39e1c3b 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -10,22 +10,20 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y) -MODEL:=petalogix-ml605 -DTB:=-dtb target/microblaze/ml605.dtb +QEMU_ARGS+=-M petalogix-ml605 -dtb target/microblaze/ml605.dtb endif ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) -MODEL:=petalogix-s3adsp1800 -DTB:= +QEMU_ARGS+=-M petalogix-s3adsp1800 endif ifeq ($(ADK_TARGET_FS),squashfs) imageinstall: $(BUILD_DIR)/root.squashfs - qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) + env PATH=$(HOST_PATH) qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS) $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif endif ifeq ($(ADK_TARGET_FS),jffs2) @@ -33,7 +31,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSJFFS2) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2) $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -43,7 +41,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS} $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -52,7 +50,7 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)' + @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 8d13c5ddd..cb8da0cec 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -22,3 +22,4 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_CMDLINE_FORCE=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index fc43ab5f1..3c3546b47 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -19,3 +19,4 @@ CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_EMACLITE=y CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y +CONFIG_CMDLINE_FORCE=y diff --git a/target/microblaze/s3adsp1800.dtb b/target/microblaze/s3adsp1800.dtb Binary files differnew file mode 100644 index 000000000..163f1632d --- /dev/null +++ b/target/microblaze/s3adsp1800.dtb diff --git a/target/microblaze/s3adsp1800.dts b/target/microblaze/s3adsp1800.dts new file mode 100644 index 000000000..9cc6bdc13 --- /dev/null +++ b/target/microblaze/s3adsp1800.dts @@ -0,0 +1,287 @@ +/dts-v1/; + +/ { + #address-cells = <0x1>; + #size-cells = <0x1>; + compatible = "xlnx,microblaze"; + model = "testing"; + + memory@90000000 { + device_type = "memory"; + reg = <0x90000000 0x8000000>; + }; + + chosen { + bootargs = "console=ttyUL0,115200"; + linux,stdout-path = "/plb@0/serial@84000000"; + }; + + cpus { + #address-cells = <0x1>; + #cpus = <0x1>; + #size-cells = <0x0>; + + cpu@0 { + clock-frequency = <0x3b9aca0>; + compatible = "xlnx,microblaze-7.10.d"; + d-cache-baseaddr = <0x90000000>; + d-cache-highaddr = <0x97ffffff>; + d-cache-line-size = <0x10>; + d-cache-size = <0x800>; + device_type = "cpu"; + i-cache-baseaddr = <0x90000000>; + i-cache-highaddr = <0x97ffffff>; + i-cache-line-size = <0x10>; + i-cache-size = <0x800>; + model = "microblaze,7.10.d"; + 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 = <0x800>; + xlnx,d-lmb = <0x1>; + xlnx,d-opb = <0x0>; + xlnx,d-plb = <0x1>; + xlnx,data-size = <0x20>; + 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 = <0x0>; + xlnx,dopb-bus-exception = <0x0>; + xlnx,dynamic-bus-sizing = <0x1>; + xlnx,edge-is-positive = <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 = <0x0>; + xlnx,icache-line-len = <0x4>; + xlnx,icache-use-fsl = <0x1>; + xlnx,ill-opcode-exception = <0x0>; + xlnx,instance = "microblaze_0"; + xlnx,interconnect = <0x1>; + xlnx,interrupt-is-edge = <0x0>; + xlnx,iopb-bus-exception = <0x0>; + xlnx,mmu-dtlb-size = <0x4>; + xlnx,mmu-itlb-size = <0x2>; + xlnx,mmu-tlb-access = <0x3>; + xlnx,mmu-zones = <0x10>; + 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>; + xlnx,sco = <0x0>; + xlnx,unaligned-exceptions = <0x1>; + xlnx,use-barrel = <0x1>; + xlnx,use-dcache = <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 = <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>; + }; + }; + + 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 { + #address-cells = <1>; + #size-cells = <1>; + bank-width = <0x1>; + compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash"; + reg = <0xa0000000 0x1000000>; + xlnx,family = "spartan3adsp"; + xlnx,include-datawidth-matching-0 = <0x1>; + xlnx,include-datawidth-matching-1 = <0x0>; + xlnx,include-datawidth-matching-2 = <0x0>; + xlnx,include-datawidth-matching-3 = <0x0>; + xlnx,include-negedge-ioregs = <0x0>; + xlnx,include-plb-ipif = <0x1>; + xlnx,include-wrbuf = <0x1>; + xlnx,max-mem-width = <0x8>; + xlnx,mch-native-dwidth = <0x20>; + xlnx,mch-plb-clk-period-ps = <0x3e80>; + xlnx,mch-splb-awidth = <0x20>; + xlnx,mch0-accessbuf-depth = <0x10>; + xlnx,mch0-protocol = <0x0>; + xlnx,mch0-rddatabuf-depth = <0x10>; + xlnx,mch1-accessbuf-depth = <0x10>; + xlnx,mch1-protocol = <0x0>; + xlnx,mch1-rddatabuf-depth = <0x10>; + xlnx,mch2-accessbuf-depth = <0x10>; + xlnx,mch2-protocol = <0x0>; + xlnx,mch2-rddatabuf-depth = <0x10>; + xlnx,mch3-accessbuf-depth = <0x10>; + xlnx,mch3-protocol = <0x0>; + xlnx,mch3-rddatabuf-depth = <0x10>; + xlnx,mem0-width = <0x8>; + xlnx,mem1-width = <0x20>; + xlnx,mem2-width = <0x20>; + xlnx,mem3-width = <0x20>; + xlnx,num-banks-mem = <0x1>; + xlnx,num-channels = <0x0>; + xlnx,priority-mode = <0x0>; + xlnx,synch-mem-0 = <0x0>; + xlnx,synch-mem-1 = <0x0>; + xlnx,synch-mem-2 = <0x0>; + xlnx,synch-mem-3 = <0x0>; + xlnx,synch-pipedelay-0 = <0x2>; + xlnx,synch-pipedelay-1 = <0x2>; + xlnx,synch-pipedelay-2 = <0x2>; + xlnx,synch-pipedelay-3 = <0x2>; + 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 = <0x11170>; + xlnx,tcedv-ps-mem-1 = <0x3a98>; + xlnx,tcedv-ps-mem-2 = <0x3a98>; + xlnx,tcedv-ps-mem-3 = <0x3a98>; + 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 = <0x61a8>; + xlnx,thzoe-ps-mem-1 = <0x1b58>; + xlnx,thzoe-ps-mem-2 = <0x1b58>; + xlnx,thzoe-ps-mem-3 = <0x1b58>; + xlnx,tlzwe-ps-mem-0 = <0x1388>; + xlnx,tlzwe-ps-mem-1 = <0x0>; + xlnx,tlzwe-ps-mem-2 = <0x0>; + xlnx,tlzwe-ps-mem-3 = <0x0>; + xlnx,twc-ps-mem-0 = <0x11170>; + xlnx,twc-ps-mem-1 = <0x3a98>; + xlnx,twc-ps-mem-2 = <0x3a98>; + xlnx,twc-ps-mem-3 = <0x3a98>; + xlnx,twp-ps-mem-0 = <0xafc8>; + xlnx,twp-ps-mem-1 = <0x2ee0>; + xlnx,twp-ps-mem-2 = <0x2ee0>; + xlnx,twp-ps-mem-3 = <0x2ee0>; + xlnx,xcl0-linesize = <0x4>; + xlnx,xcl0-writexfer = <0x1>; + xlnx,xcl1-linesize = <0x4>; + xlnx,xcl1-writexfer = <0x1>; + xlnx,xcl2-linesize = <0x4>; + xlnx,xcl2-writexfer = <0x1>; + xlnx,xcl3-linesize = <0x4>; + xlnx,xcl3-writexfer = <0x1>; + partition@0x00000000 { + label = "rootfs"; + reg = <0x00000000 0x01000000>; + }; + }; + + gpio@81400000 { + compatible = "xlnx,xps-gpio-1.00.a"; + interrupt-parent = <0x1>; + interrupts = <0x2 0x2>; + reg = <0x81400000 0x10000>; + xlnx,all-inputs = <0x0>; + xlnx,all-inputs-2 = <0x0>; + xlnx,dout-default = <0x0>; + xlnx,dout-default-2 = <0x0>; + xlnx,family = "spartan3adsp"; + xlnx,gpio-width = <0x8>; + xlnx,interrupt-present = <0x1>; + xlnx,is-bidir = <0x0>; + xlnx,is-bidir-2 = <0x1>; + xlnx,is-dual = <0x0>; + xlnx,tri-default = <0xffffffff>; + xlnx,tri-default-2 = <0xffffffff>; + }; + + serial@84000000 { + clock-frequency = <0x3b9aca0>; + compatible = "xlnx,xps-uartlite-1.00.a"; + current-speed = <0x1c200>; + device_type = "serial"; + interrupt-parent = <0x1>; + interrupts = <0x3 0x0>; + port-number = <0x0>; + reg = <0x84000000 0x10000>; + xlnx,baudrate = <0x1c200>; + xlnx,data-bits = <0x8>; + xlnx,family = "spartan3adsp"; + xlnx,odd-parity = <0x0>; + xlnx,use-parity = <0x0>; + }; + + debug@84400000 { + compatible = "xlnx,mdm-1.00.d"; + reg = <0x84400000 0x10000>; + xlnx,family = "spartan3adsp"; + xlnx,interconnect = <0x1>; + xlnx,jtag-chain = <0x2>; + xlnx,mb-dbg-ports = <0x1>; + xlnx,uart-width = <0x8>; + xlnx,use-uart = <0x1>; + xlnx,write-fsl-ports = <0x0>; + }; + + mpmc@90000000 { + #address-cells = <0x1>; + #size-cells = <0x1>; + compatible = "xlnx,mpmc-4.03.a"; + }; + + interrupt-controller@81800000 { + #interrupt-cells = <0x2>; + compatible = "xlnx,xps-intc-1.00.a"; + interrupt-controller; + reg = <0x81800000 0x10000>; + xlnx,kind-of-intr = <0xa>; + xlnx,num-intr-inputs = <0x4>; + linux,phandle = <0x1>; + }; + + timer@83c00000 { + compatible = "xlnx,xps-timer-1.00.a"; + interrupt-parent = <0x1>; + interrupts = <0x0 0x2>; + reg = <0x83c00000 0x10000>; + xlnx,count-width = <0x20>; + xlnx,family = "spartan3adsp"; + xlnx,gen0-assert = <0x1>; + xlnx,gen1-assert = <0x1>; + xlnx,one-timer-only = <0x0>; + xlnx,trig0-assert = <0x1>; + xlnx,trig1-assert = <0x1>; + }; + }; +}; diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze index 63214e39b..ee9cb6a52 100644 --- a/target/microblaze/sys-available/qemu-microblaze +++ b/target/microblaze/sys-available/qemu-microblaze @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE select ADK_big select ADK_qemu_microblaze select ADK_HARDWARE_QEMU + select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN help Qemu support for microblaze big endian architecture. diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel index a58083770..8dff0e260 100644 --- a/target/microblaze/sys-available/qemu-microblazeel +++ b/target/microblaze/sys-available/qemu-microblazeel @@ -1,9 +1,10 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL bool "Qemu Emulator (little endian)" - select ADK_microblazeel + select ADK_microblaze select ADK_qemu_microblazeel select ADK_little select ADK_HARDWARE_QEMU + select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN help Qemu support for microblaze little endian architecture. diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze index 6fb76c5f5..3b8d3512b 100644 --- a/target/microblaze/sys-available/toolchain-microblaze +++ b/target/microblaze/sys-available/toolchain-microblaze @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE select ADK_big select ADK_toolchain_microblaze select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Microblaze toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblazeel b/target/microblaze/sys-available/toolchain-microblazeel index 8992e5550..c41e26f91 100644 --- a/target/microblaze/sys-available/toolchain-microblazeel +++ b/target/microblaze/sys-available/toolchain-microblazeel @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZEEL select ADK_little select ADK_toolchain_microblazeel select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Microblaze toolchain. diff --git a/target/microblaze/target.mk b/target/microblaze/target.mk index bee74e465..c179123f9 100644 --- a/target/microblaze/target.mk +++ b/target/microblaze/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= microblaze CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/mips/Makefile b/target/mips/Makefile index 436b570e3..bd3a763b6 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -101,7 +101,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index 3f06298bf..d3129fbda 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -2,7 +2,6 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y -CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_MIPS32_R1=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 index 5ceba460c..3a1be029e 100644 --- a/target/mips/kernel/qemu-mips64 +++ b/target/mips/kernel/qemu-mips64 @@ -1,6 +1,5 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y -CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_MIPS64_R1=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el index 383b7f160..40192aff2 100644 --- a/target/mips/kernel/qemu-mips64el +++ b/target/mips/kernel/qemu-mips64el @@ -1,6 +1,5 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y -CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS64_R1=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel index e16f008b7..d3129fbda 100644 --- a/target/mips/kernel/qemu-mipsel +++ b/target/mips/kernel/qemu-mipsel @@ -2,7 +2,6 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y -CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS32_R1=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y diff --git a/target/mips/sys-available/lemote-yeelong b/target/mips/sys-available/lemote-yeelong index af58ff019..0a6fd9c32 100644 --- a/target/mips/sys-available/lemote-yeelong +++ b/target/mips/sys-available/lemote-yeelong @@ -12,6 +12,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_HDD select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_VMLINUZ help System profile for Lemote Yeelong laptop. diff --git a/target/mips/sys-available/mikrotik-rb532 b/target/mips/sys-available/mikrotik-rb532 index b787a3852..96ca4d46d 100644 --- a/target/mips/sys-available/mikrotik-rb532 +++ b/target/mips/sys-available/mikrotik-rb532 @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532 select ADK_mikrotik_rb532 select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_WATCHDOG - select ADK_TARGET_WITH_CF select ADK_TARGET_WITH_NAND select ADK_TARGET_WITH_LEDS depends on ADK_BROKEN diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 98aaf8a02..d3ea99011 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS - bool "Qemu Emulator (big endian)" + bool "Qemu Emulator (mips32 big endian)" select ADK_mips select ADK_big select ADK_qemu_mips select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips big endian architecture. + Qemu support for mips32 big endian architecture. diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64 index 10da0835c..ce9c5b0fa 100644 --- a/target/mips/sys-available/qemu-mips64 +++ b/target/mips/sys-available/qemu-mips64 @@ -1,12 +1,13 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64 - bool "Qemu Emulator (mips64 big endian)" + bool "Qemu Emulator (mips64 big endian o32 abi)" select ADK_mips select ADK_big + select ADK_o32 select ADK_qemu_mips64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips64 big endian architecture. + Qemu support for mips64 big endian architecture with o32 abi. diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el index 82bb7fbf2..067d0d6ed 100644 --- a/target/mips/sys-available/qemu-mips64el +++ b/target/mips/sys-available/qemu-mips64el @@ -1,11 +1,12 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL - bool "Qemu Emulator (mips64 little endian)" + bool "Qemu Emulator (mips64 little endian o32 abi)" select ADK_mips select ADK_little + select ADK_o32 select ADK_qemu_mips64el select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips64 little endian architecture. + Qemu support for mips64 little endian architecture with o32 abi. diff --git a/target/mips/sys-available/qemu-mips64eln32 b/target/mips/sys-available/qemu-mips64eln32 new file mode 100644 index 000000000..31c93b75c --- /dev/null +++ b/target/mips/sys-available/qemu-mips64eln32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_QEMU_MIPS64ELN32 + bool "Qemu Emulator (mips64 little endian n32 abi)" + select ADK_mips + select ADK_little + select ADK_n32 + select ADK_qemu_mips64el + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_VMLINUZ + help + Qemu support for mips64 little endian architecture with n32 abi. diff --git a/target/mips/sys-available/qemu-mips64eln64 b/target/mips/sys-available/qemu-mips64eln64 new file mode 100644 index 000000000..0f0697602 --- /dev/null +++ b/target/mips/sys-available/qemu-mips64eln64 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_QEMU_MIPS64ELN64 + bool "Qemu Emulator (mips64 little endian n64 abi)" + select ADK_mips + select ADK_little + select ADK_n64 + select ADK_qemu_mips64el + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_VMLINUZ + help + Qemu support for mips64 little endian architecture with n64 abi. diff --git a/target/mips/sys-available/qemu-mips64n32 b/target/mips/sys-available/qemu-mips64n32 new file mode 100644 index 000000000..614edde0b --- /dev/null +++ b/target/mips/sys-available/qemu-mips64n32 @@ -0,0 +1,13 @@ +config ADK_TARGET_SYSTEM_QEMU_MIPS64N32 + bool "Qemu Emulator (mips64 big endian n32 abi)" + select ADK_mips + select ADK_big + select ADK_n32 + select ADK_qemu_mips64 + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_VMLINUZ + help + Qemu support for mips64 big endian architecture with n32 abi. + diff --git a/target/mips/sys-available/qemu-mips64n64 b/target/mips/sys-available/qemu-mips64n64 new file mode 100644 index 000000000..49ad7bba8 --- /dev/null +++ b/target/mips/sys-available/qemu-mips64n64 @@ -0,0 +1,13 @@ +config ADK_TARGET_SYSTEM_QEMU_MIPS64N64 + bool "Qemu Emulator (mips64 big endian n64 abi)" + select ADK_mips + select ADK_big + select ADK_n64 + select ADK_qemu_mips64 + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_VMLINUZ + help + Qemu support for mips64 big endian architecture with n64 abi. + diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel index 7163ae120..688471d6d 100644 --- a/target/mips/sys-available/qemu-mipsel +++ b/target/mips/sys-available/qemu-mipsel @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL - bool "Qemu Emulator (little endian)" + bool "Qemu Emulator (mips32 little endian)" select ADK_mips select ADK_qemu_mipsel select ADK_little select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips little endian architecture. + Qemu support for mips32 little endian architecture. diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index 9e93cfdcd..7c7e1c142 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/target/mips/sys-available/toolchain-mips @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS - bool "Toolchain only (big endian)" + bool "Toolchain only (mips32 big endian)" select ADK_mips select ADK_big select ADK_toolchain_mips select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help - MIPS toolchain. + MIPS32 big endian toolchain. diff --git a/target/mips/sys-available/toolchain-mips64 b/target/mips/sys-available/toolchain-mips64 index e9ea69170..f1cc555a2 100644 --- a/target/mips/sys-available/toolchain-mips64 +++ b/target/mips/sys-available/toolchain-mips64 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 big endian o32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64el b/target/mips/sys-available/toolchain-mips64el index 0d54692ee..7aa82f05d 100644 --- a/target/mips/sys-available/toolchain-mips64el +++ b/target/mips/sys-available/toolchain-mips64el @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 little endian o32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64eln32 b/target/mips/sys-available/toolchain-mips64eln32 index 9c0f44381..96f409ba6 100644 --- a/target/mips/sys-available/toolchain-mips64eln32 +++ b/target/mips/sys-available/toolchain-mips64eln32 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN32 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 little endian n32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64eln64 b/target/mips/sys-available/toolchain-mips64eln64 index 2795598d8..f28b14997 100644 --- a/target/mips/sys-available/toolchain-mips64eln64 +++ b/target/mips/sys-available/toolchain-mips64eln64 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 little endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64n32 b/target/mips/sys-available/toolchain-mips64n32 index e2acd59b3..1337d3e37 100644 --- a/target/mips/sys-available/toolchain-mips64n32 +++ b/target/mips/sys-available/toolchain-mips64n32 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N32 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 big endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64n64 b/target/mips/sys-available/toolchain-mips64n64 index e544008f4..4cb4939e5 100644 --- a/target/mips/sys-available/toolchain-mips64n64 +++ b/target/mips/sys-available/toolchain-mips64n64 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 big endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel index 4c197b808..4032f9d94 100644 --- a/target/mips/sys-available/toolchain-mipsel +++ b/target/mips/sys-available/toolchain-mipsel @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL - bool "Toolchain only (little endian)" + bool "Toolchain only (mips32 little endian)" select ADK_mips select ADK_little select ADK_toolchain_mipsel select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help - MIPS toolchain. + MIPS32 little endian toolchain. diff --git a/target/mips/target.mk b/target/mips/target.mk index f4864d2cc..8b13be890 100644 --- a/target/mips/target.mk +++ b/target/mips/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= mips CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console index ef688a3af..68ff1f0b5 100644 --- a/target/packages/pkg-available/console +++ b/target/packages/pkg-available/console @@ -3,6 +3,7 @@ config ADK_PKG_CONSOLE default n select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER + select ADK_PACKAGE_DROPBEAR select ADK_PACKAGE_SCREEN select ADK_PACKAGE_SUDO select ADK_PACKAGE_LINKS diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index b1edc40e1..31fd10381 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -2,9 +2,12 @@ config ADK_PKG_MPDBOX bool "Choose packages for MPDBox system" default n select ADK_PACKAGE_MPDBOX + select ADK_PACKAGE_DROPBEAR + select BUSYBOX_NTPD select ADK_PACKAGE_CIFS_UTILS - select ADK_PACKAGE_NFS_UTILS if ADK_TARGET_LIB_GLIBC - select ADK_PACKAGE_NFS_UTILS_CLIENT if ADK_TARGET_LIB_GLIBC + select ADK_PACKAGE_NFS_UTILS + select ADK_PACKAGE_NFS_UTILS_CLIENT + select ADK_PACKAGE_NTFS_3G select ADK_PACKAGE_LIBMPDCLIENT select ADK_PACKAGE_MPC select ADK_PACKAGE_MPD @@ -22,7 +25,6 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE select ADK_PACKAGE_MPD_WITH_HTTPD - select ADK_PACKAGE_CPUFREQUTILS select ADK_PACKAGE_FILE select ADK_PACKAGE_HTOP select ADK_PACKAGE_DROPBEAR @@ -49,11 +51,13 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_PHP_FASTCGI select ADK_PACKAGE_SCREEN select ADK_PACKAGE_VIM + select ADK_PACKAGE_E2FSCK select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686 select ADK_KPACKAGE_KMOD_SND_USB_AUDIO select ADK_KPACKAGE_KMOD_USB_STORAGE + select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC if ADK_TARGET_SYSTEM_RASPBERRY_PI help Create a small mpdbox. diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index 7bbbe5310..e9db8161b 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -5,11 +5,13 @@ config ADK_PKG_TEST select ADK_PACKAGE_SOCAT select ADK_PACKAGE_MAKE select ADK_PACKAGE_FILE + select ADK_PACKAGE_RDATE select ADK_KERNEL_BLK_DEV_INITRD select ADK_KERNEL_COMP_XZ select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ select ADK_SIMPLE_NETWORK_CONFIG select ADK_KPACKAGE_KMOD_IPV6 + select ADK_TARGET_PACKAGE_TXZ default n help Package collection used to build adk-test-framework root diff --git a/target/ppc/Makefile b/target/ppc/Makefile index aae63f1c0..fa1cd1698 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -17,7 +17,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_HARDWARE_QEMU),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-ppc -M mac99 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc index 54e35e6a5..dd432ecda 100644 --- a/target/ppc/sys-available/toolchain-ppc +++ b/target/ppc/sys-available/toolchain-ppc @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC select ADK_toolchain_ppc select ADK_CPU_PPC select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a ppc toolchain. diff --git a/target/ppc/target.mk b/target/ppc/target.mk index bd6624fe7..47ae3121f 100644 --- a/target/ppc/target.mk +++ b/target/ppc/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= powerpc CPU_ARCH:= ppc -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -Wl,--secure-plt diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 6ee949a09..5b9c1caa6 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -17,7 +17,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_HARDWARE_QEMU),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-ppc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/ppc64/sys-available/qemu-ppc64 b/target/ppc64/sys-available/qemu-ppc64 index 8f7715cf8..ffc77a388 100644 --- a/target/ppc64/sys-available/qemu-ppc64 +++ b/target/ppc64/sys-available/qemu-ppc64 @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_ppc64 select ADK_qemu_ppc64 select ADK_CPU_PPC64 + select ADK_LINUX_64 select ADK_HARDWARE_QEMU help Support for Qemu Emulator (PPC64). diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64 index 3615aab85..dce18a3a3 100644 --- a/target/ppc64/sys-available/toolchain-ppc64 +++ b/target/ppc64/sys-available/toolchain-ppc64 @@ -3,8 +3,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64 select ADK_ppc64 select ADK_toolchain_ppc64 select ADK_CPU_PPC64 + select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a ppc64 toolchain. diff --git a/target/ppc64/target.mk b/target/ppc64/target.mk index 7ccf65b9c..5a0ecc30f 100644 --- a/target/ppc64/target.mk +++ b/target/ppc64/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= powerpc CPU_ARCH:= ppc64 -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sh/Makefile b/target/sh/Makefile index 0d5706eb3..12f8d0ce4 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -17,7 +17,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/sh/sys-available/toolchain-sh b/target/sh/sys-available/toolchain-sh index 287401079..b9dedcfd2 100644 --- a/target/sh/sys-available/toolchain-sh +++ b/target/sh/sys-available/toolchain-sh @@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH select ADK_toolchain_sh select ADK_CPU_SH4 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a superh toolchain (sh4). diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4 new file mode 100644 index 000000000..4d7fff826 --- /dev/null +++ b/target/sh/sys-available/toolchain-sh4 @@ -0,0 +1,11 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4 + bool "Toolchain only (little endian)" + select ADK_sh + select ADK_little + select ADK_toolchain_sh + select ADK_CPU_SH4 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TXZ + help + Build a superh toolchain (sh4). + diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb new file mode 100644 index 000000000..cccc163e1 --- /dev/null +++ b/target/sh/sys-available/toolchain-sh4eb @@ -0,0 +1,11 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB + bool "Toolchain only (big endian)" + select ADK_sh + select ADK_big + select ADK_toolchain_sheb + select ADK_CPU_SH4 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TXZ + help + Build a superh toolchain (sh4 big endian). + diff --git a/target/sh/sys-available/toolchain-sheb b/target/sh/sys-available/toolchain-sheb index 236d4e486..f61547d24 100644 --- a/target/sh/sys-available/toolchain-sheb +++ b/target/sh/sys-available/toolchain-sheb @@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SHEB select ADK_toolchain_sheb select ADK_CPU_SH4 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a superh toolchain (sh4 big endian). diff --git a/target/sh/target.mk b/target/sh/target.mk index b5630cced..408dd12c5 100644 --- a/target/sh/target.mk +++ b/target/sh/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= sh CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sparc/Makefile b/target/sparc/Makefile index 1e15ee7f0..356f8745b 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -16,7 +16,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-sparc -M SS-5 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"' endif diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc index e668592e2..e7f5aafc4 100644 --- a/target/sparc/sys-available/toolchain-sparc +++ b/target/sparc/sys-available/toolchain-sparc @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC select ADK_toolchain_sparc select ADK_CPU_SPARC_V8 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a sparc toolchain. diff --git a/target/sparc/target.mk b/target/sparc/target.mk index 4de28f960..960a7cf19 100644 --- a/target/sparc/target.mk +++ b/target/sparc/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= sparc CPU_ARCH:= sparc -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 882189284..657d2ed4f 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -27,7 +27,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-sparc64 $(QEMU_ARGS) -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/sparc64/sys-available/qemu-sparc64 b/target/sparc64/sys-available/qemu-sparc64 index 062ad83e9..d750ea1e4 100644 --- a/target/sparc64/sys-available/qemu-sparc64 +++ b/target/sparc64/sys-available/qemu-sparc64 @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64 bool "Qemu Emulator" select ADK_sparc64 select ADK_qemu_sparc64 + select ADK_LINUX_64 select ADK_CPU_SPARC_V9 select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64 index 15eaca575..a83ecd198 100644 --- a/target/sparc64/sys-available/toolchain-sparc64 +++ b/target/sparc64/sys-available/toolchain-sparc64 @@ -3,8 +3,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64 select ADK_sparc64 select ADK_toolchain_sparc64 select ADK_CPU_SPARC_V9 + select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a sparc64 toolchain. diff --git a/target/sparc64/target.mk b/target/sparc64/target.mk index 663e42d23..dda789e55 100644 --- a/target/sparc64/target.mk +++ b/target/sparc64/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= sparc CPU_ARCH:= sparc64 -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/tarch.lst b/target/tarch.lst index 09eed2265..60e064398 100644 --- a/target/tarch.lst +++ b/target/tarch.lst @@ -9,9 +9,14 @@ mips64 mips64n32 mips64n64 mips64el +mips64eln32 +mips64eln64 ppc ppc64 +sh4 +sh4eb sparc sparc64 x86 x86_64 +x86_64_x32 diff --git a/target/x86/Makefile b/target/x86/Makefile index 15d980d7c..27920819f 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -8,6 +8,11 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +CREATE:=./scripts/create.sh -g +else +CREATE:=./scripts/create.sh +endif ifeq ($(ADK_TARGET_FS),genext2fs) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @@ -31,10 +36,14 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_HARDWARE_QEMU),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) + @echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img' +else @echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif +endif ifeq ($(ADK_HARDWARE_VBOX),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a VirtualBox Image:" diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc new file mode 100644 index 000000000..8b26b4d30 --- /dev/null +++ b/target/x86/kernel/generic-pc @@ -0,0 +1,23 @@ +CONFIG_X86=y +CONFIG_X86_32=y +CONFIG_PCI=y +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=y +CONFIG_PCNET32=y +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_RTL8139CP=y +CONFIG_8139TOO=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=y +CONFIG_E1000=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_ATA=y +CONFIG_ATA_SFF=y +CONFIG_ATA_BMDMA=y +CONFIG_ATA_PIIX=y diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-x86 index 7eb708745..7eb708745 100644 --- a/target/x86/kernel/qemu-i686 +++ b/target/x86/kernel/qemu-x86 diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc new file mode 100644 index 000000000..76d228936 --- /dev/null +++ b/target/x86/sys-available/generic-pc @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_GENERIC_PC + bool "Generic PC (486)" + select ADK_x86 + select ADK_generic_pc + select ADK_CPU_I486 + select ADK_TARGET_KERNEL_BZIMAGE + help + Support for generic PC (i486). + diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index ac94bb1ec..80c5bf531 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -13,13 +13,14 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_RTC - select ADK_TARGET_WITH_CF select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_HDD select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_ACPI # with docking station select ADK_TARGET_WITH_PP + select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_BZIMAGE + select ADK_PACKAGE_GRUB_BIN help System profile for IBM X40 laptop. diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c index 902c004a1..484439328 100644 --- a/target/x86/sys-available/pcengines-alix1c +++ b/target/x86/sys-available/pcengines-alix1c @@ -14,7 +14,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_RTC - select ADK_TARGET_WITH_CF select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_USB_BOOT select ADK_TARGET_KERNEL_BZIMAGE diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13 index c92c0d36e..33e939348 100644 --- a/target/x86/sys-available/pcengines-alix2d13 +++ b/target/x86/sys-available/pcengines-alix2d13 @@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_LEDS select ADK_TARGET_WITH_WATCHDOG - select ADK_TARGET_WITH_CF select ADK_TARGET_KERNEL_BZIMAGE depends on ADK_BROKEN help diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2 index fd83a700a..a48bec2cc 100644 --- a/target/x86/sys-available/pcengines-alix2d2 +++ b/target/x86/sys-available/pcengines-alix2d2 @@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_LEDS select ADK_TARGET_WITH_WATCHDOG - select ADK_TARGET_WITH_CF select ADK_TARGET_KERNEL_BZIMAGE depends on ADK_BROKEN help diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap index 2fa4e13c4..50db08ccf 100644 --- a/target/x86/sys-available/pcengines-wrap +++ b/target/x86/sys-available/pcengines-wrap @@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP select ADK_pcengines_wrap select ADK_CPU_I486 select ADK_KERNEL_I486 - select ADK_TARGET_WITH_CF select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_KERNEL_BZIMAGE diff --git a/target/x86/sys-available/qemu-i486 b/target/x86/sys-available/qemu-i486 new file mode 100644 index 000000000..dc0da52ca --- /dev/null +++ b/target/x86/sys-available/qemu-i486 @@ -0,0 +1,10 @@ +config ADK_TARGET_SYSTEM_QEMU_I486 + bool "Qemu Emulator (i486)" + select ADK_x86 + select ADK_qemu_i486 + select ADK_CPU_I486 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_BZIMAGE + help + Support for Qemu Emulator (i486). + diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686 index b047bc482..b2951a1e2 100644 --- a/target/x86/sys-available/qemu-i686 +++ b/target/x86/sys-available/qemu-i686 @@ -1,5 +1,5 @@ config ADK_TARGET_SYSTEM_QEMU_I686 - bool "Qemu Emulator" + bool "Qemu Emulator (i686)" select ADK_x86 select ADK_qemu_i686 select ADK_CPU_I686 diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686 index bec515fca..b7c3be238 100644 --- a/target/x86/sys-available/toolchain-i686 +++ b/target/x86/sys-available/toolchain-i686 @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 select ADK_toolchain_x86 select ADK_CPU_I686 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86 toolchain (i686 optimized). diff --git a/target/x86/target.mk b/target/x86/target.mk index 30e558283..ecb811221 100644 --- a/target/x86/target.mk +++ b/target/x86/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= x86 CPU_ARCH:= $(strip $(subst ",, $(ADK_TARGET_CPU_ARCH))) -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index 48b6fceab..5067a8ecf 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 select ADK_qemu_x86_64 + select ADK_64 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU diff --git a/target/x86_64/sys-available/qemu-x86_64_x32 b/target/x86_64/sys-available/qemu-x86_64_x32 new file mode 100644 index 000000000..9108c7951 --- /dev/null +++ b/target/x86_64/sys-available/qemu-x86_64_x32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_QEMU_X86_64_X32 + bool "Qemu Emulator (x86_64 with X32 ABI)" + select ADK_x86_64 + select ADK_qemu_x86_64 + select ADK_x32 + select ADK_CPU_X86_64 + select ADK_LINUX_64 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_BZIMAGE + help + Support for Qemu Emulator. + diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index c268e9687..b93b479a1 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -1,10 +1,12 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 bool "Toolchain only" select ADK_x86_64 + select ADK_64 select ADK_toolchain_x86_64 select ADK_CPU_X86_64 + select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86_64 toolchain. diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32 new file mode 100644 index 000000000..9e8297ea4 --- /dev/null +++ b/target/x86_64/sys-available/toolchain-x86_64_32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32 + bool "Toolchain only (32 ABI)" + select ADK_x86_64 + select ADK_32 + select ADK_toolchain_x86_64 + select ADK_CPU_X86_64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TXZ + help + Build a x86_64 toolchain. + diff --git a/target/x86_64/sys-available/toolchain-x86_64_x32 b/target/x86_64/sys-available/toolchain-x86_64_x32 new file mode 100644 index 000000000..22d94171f --- /dev/null +++ b/target/x86_64/sys-available/toolchain-x86_64_x32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_X32 + bool "Toolchain only (x32 ABI)" + select ADK_x86_64 + select ADK_x32 + select ADK_toolchain_x86_64 + select ADK_CPU_X86_64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TXZ + help + Build a x86_64 toolchain. + diff --git a/target/x86_64/target.mk b/target/x86_64/target.mk index 3eed00bf5..f381673fa 100644 --- a/target/x86_64/target.mk +++ b/target/x86_64/target.mk @@ -1,5 +1,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= x86 CPU_ARCH:= x86_64 -TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) |