From 07cff613bc08535341cc00ce4f8dcf4cca3489b3 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 9 Dec 2013 15:47:07 +0100 Subject: add tools/cdrtools --- tools/Makefile | 2 +- tools/cdrtools/Makefile | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tools/cdrtools/Makefile diff --git a/tools/Makefile b/tools/Makefile index ee096db61..e78a7fe42 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk -TARGETS:=adk mkcrypt cpio mkimage genext2fs +TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/cdrtools/Makefile b/tools/cdrtools/Makefile new file mode 100644 index 000000000..6b54d0eac --- /dev/null +++ b/tools/cdrtools/Makefile @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= cdrtools +PKG_VERSION:= 3.00 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b7b6361bcce2cedff1ae437fadafe53b +PKG_SITES:= ftp://ftp.berlios.de/pub/cdrecord/ + +include ../rules.mk + +install: ${TOOLS_DIR}/mkisofs + +$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared + #(cd ${WRKBUILD}; ./configure) + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' + touch $@ + +${TOOLS_DIR}/mkisofs: $(WRKBUILD)/.compiled + $(INSTALL_BIN) $(WRKBUILD)/mkisofs/OBJ/*/mkisofs \ + ${TOOLS_DIR} + +include $(TOPDIR)/mk/tools.mk -- cgit v1.2.3 From 1d41dfd46f6f45ed351a677fb22eea072c6530df Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 9 Dec 2013 15:47:08 +0100 Subject: add tools/syslinux --- tools/Makefile | 2 +- tools/syslinux/Makefile | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 tools/syslinux/Makefile diff --git a/tools/Makefile b/tools/Makefile index e78a7fe42..86eb09e22 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk -TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools +TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools syslinux TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/syslinux/Makefile b/tools/syslinux/Makefile new file mode 100644 index 000000000..2f44c301b --- /dev/null +++ b/tools/syslinux/Makefile @@ -0,0 +1,37 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= syslinux +PKG_VERSION:= 6.02 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 086ac1c569d226a5e2ae3d605de09a1d +PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/ + +include ../rules.mk +WRKINST:= ${WRKBUILD}/openadk_installroot + +install: ${TOOLS_DIR}/extlinux ${STAGING_HOST_DIR}/usr/share/syslinux/.installed + +$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared + #(cd ${WRKBUILD}; ./configure) + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' bios installer + touch $@ + +$(WRKBUILD)/.installed: ${WRKBUILD}/.compiled + mkdir -p ${WRKINST} + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' \ + INSTALLROOT='${WRKINST}' \ + bios install + +${TOOLS_DIR}/extlinux: $(WRKBUILD)/.installed + $(INSTALL_BIN) ${WRKINST}/sbin/extlinux \ + ${TOOLS_DIR} + +${STAGING_HOST_DIR}/usr/share/syslinux/.installed: ${WRKBUILD}/.installed + mkdir -p ${STAGING_HOST_DIR}/usr/share + ${CP} ${WRKINST}/usr/share/syslinux ${STAGING_HOST_DIR}/usr/share + touch ${STAGING_HOST_DIR}/usr/share/syslinux/.installed + +include $(TOPDIR)/mk/tools.mk -- cgit v1.2.3 From 0e14700702f06f09f25bc861e2642a6d42da982b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Dec 2013 14:09:00 +0100 Subject: need to merge third patch from Phil manually. disable on non Linux hosts --- mk/image.mk | 13 +++++++++++++ mk/rootfs.mk | 1 + target/config/Config.in | 10 ++++++++++ target/linux/config/Config.in.block | 4 ++++ target/linux/config/Config.in.fs | 6 +++++- target/x86/Makefile | 4 ++++ tools/cdrtools/Makefile | 2 +- 7 files changed, 38 insertions(+), 2 deletions(-) diff --git a/mk/image.mk b/mk/image.mk index 2273b4af7..7c519d7f5 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -121,12 +121,14 @@ INITRAMFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz +ROOTFSISO= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso else TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz +ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso endif ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package @@ -197,5 +199,16 @@ endif $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE) +${BIN_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package + mkdir -p ${TARGET_DIR}/boot/syslinux + cp ${STAGING_HOST_DIR}/usr/share/syslinux/{isolinux.bin,ldlinux.c32} \ + ${TARGET_DIR}/boot/syslinux + echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \ + ${TARGET_DIR}/boot/syslinux/isolinux.cfg + ${TOOLS_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \ + -b boot/syslinux/isolinux.bin \ + -c boot/syslinux/boot.cat -no-emul-boot \ + -boot-load-size 4 -boot-info-table ${TARGET_DIR} + imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-* diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 283c87aa7..18d4f83dc 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -52,5 +52,6 @@ $(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS))) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) +$(eval $(call rootfs_template,iso,ISO)) export ADK_TARGET_FS diff --git a/target/config/Config.in b/target/config/Config.in index f551e21a0..7ddc7b83c 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -748,6 +748,16 @@ config ADK_TARGET_ROOTFS_MMC Use this option if you have a MMC/SDCARD based system. (ext2 filesystem is used.) +config ADK_TARGET_ROOTFS_ISO + bool "ISO image" + select ADK_KERNEL_ISO9660_FS + select ADK_KERNEL_JOLIET + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV_SR + depends on ADK_HOST_LINUX + help + Use this option to create a bootable ISO image. + config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index bbd9ce745..fb5bf080f 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI config ADK_KERNEL_BLK_DEV_SD boolean +config ADK_KERNEL_BLK_DEV_SR + boolean + config ADK_KERNEL_ISCSI_TCP boolean @@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD config ADK_KPACKAGE_KMOD_BLK_DEV_SR prompt "kmod-scsi-cdrom................... SCSI CDROM support" depends on !ADK_KERNEL_SCSI + depends on !ADK_KERNEL_BLK_DEV_SR depends on ADK_KPACKAGE_KMOD_SCSI tristate help diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index ab048805e..9bdc6b9e5 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -227,7 +227,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS fuse-utils. config ADK_KERNEL_JOLIET - bool + boolean + default n + +config ADK_KERNEL_ISO9660_FS + boolean default n config ADK_KPACKAGE_KMOD_ISO9660_FS diff --git a/target/x86/Makefile b/target/x86/Makefile index a3dc8ae70..87d3b5806 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -65,4 +65,8 @@ ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif +ifeq (${ADK_TARGET_FS},iso) +imageinstall: ${BIN_DIR}/${ROOTFSISO} + @echo 'ISO image is at $<' +endif endif diff --git a/tools/cdrtools/Makefile b/tools/cdrtools/Makefile index 6b54d0eac..965e3553d 100644 --- a/tools/cdrtools/Makefile +++ b/tools/cdrtools/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cdrtools PKG_VERSION:= 3.00 PKG_RELEASE:= 1 -PKG_MD5SUM:= b7b6361bcce2cedff1ae437fadafe53b +PKG_MD5SUM:= bb21cefefcfbb76cf249120e8978ffdd PKG_SITES:= ftp://ftp.berlios.de/pub/cdrecord/ include ../rules.mk -- cgit v1.2.3 From f377248abda877e2a945f4152e3e57bbaaeec1ca Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Dec 2013 14:11:52 +0100 Subject: use linux.bin without included dtb, dtb is already provided by qemu. no need to patch kernel dts. --- target/config/Config.in | 2 +- target/linux/patches/3.11.10/microblaze-dts.patch | 475 ---------------------- toolchain/musl/Makefile | 3 + 3 files changed, 4 insertions(+), 476 deletions(-) delete mode 100644 target/linux/patches/3.11.10/microblaze-dts.patch diff --git a/target/config/Config.in b/target/config/Config.in index e59b86010..c02461819 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -20,7 +20,7 @@ config ADK_TARGET_KERNEL string default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE - default "simpleImage.system" if ADK_TARGET_KERNEL_LINUXBIN + default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE default "vmlinux" diff --git a/target/linux/patches/3.11.10/microblaze-dts.patch b/target/linux/patches/3.11.10/microblaze-dts.patch deleted file mode 100644 index e73959a73..000000000 --- a/target/linux/patches/3.11.10/microblaze-dts.patch +++ /dev/null @@ -1,475 +0,0 @@ -diff -Nur linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts linux-3.11.10/arch/microblaze/platform/generic/system.dts ---- linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts 2013-11-29 19:42:37.000000000 +0100 -+++ linux-3.11.10/arch/microblaze/platform/generic/system.dts 2013-12-08 13:01:59.000000000 +0100 -@@ -1,102 +1,72 @@ --/* -- * Device Tree Generator version: 1.1 -- * -- * (C) Copyright 2007-2008 Xilinx, Inc. -- * (C) Copyright 2007-2009 Michal Simek -- * -- * Michal SIMEK -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of -- * the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -- * MA 02111-1307 USA -- * -- * CAUTION: This file is automatically generated by libgen. -- * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6 -- * -- * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101 -- */ -- - /dts-v1/; -+ - / { -- #address-cells = <1>; -- #size-cells = <1>; -+ #address-cells = <0x1>; -+ #size-cells = <0x1>; - compatible = "xlnx,microblaze"; -- hard-reset-gpios = <&LEDs_8Bit 2 1>; - model = "testing"; -- DDR2_SDRAM: memory@90000000 { -+ -+ memory@90000000 { - device_type = "memory"; -- reg = < 0x90000000 0x10000000 >; -- } ; -- aliases { -- ethernet0 = &Hard_Ethernet_MAC; -- serial0 = &RS232_Uart_1; -- } ; -+ reg = <0x90000000 0x8000000>; -+ }; -+ - chosen { -- bootargs = "console=ttyUL0,115200 highres=on"; -+ bootargs = "console=ttyUL0,115200"; - linux,stdout-path = "/plb@0/serial@84000000"; -- } ; -+ }; -+ - cpus { -- #address-cells = <1>; -+ #address-cells = <0x1>; - #cpus = <0x1>; -- #size-cells = <0>; -- microblaze_0: cpu@0 { -- clock-frequency = <125000000>; -+ #size-cells = <0x0>; -+ -+ cpu@0 { -+ clock-frequency = <0x3b9aca0>; - compatible = "xlnx,microblaze-7.10.d"; - d-cache-baseaddr = <0x90000000>; -- d-cache-highaddr = <0x9fffffff>; -+ d-cache-highaddr = <0x97ffffff>; - d-cache-line-size = <0x10>; -- d-cache-size = <0x2000>; -+ d-cache-size = <0x800>; - device_type = "cpu"; - i-cache-baseaddr = <0x90000000>; -- i-cache-highaddr = <0x9fffffff>; -+ i-cache-highaddr = <0x97ffffff>; - i-cache-line-size = <0x10>; -- i-cache-size = <0x2000>; -+ i-cache-size = <0x800>; - model = "microblaze,7.10.d"; -- reg = <0>; -- timebase-frequency = <125000000>; -- xlnx,addr-tag-bits = <0xf>; -+ reg = <0x0>; -+ timebase-frequency = <0x3b9aca0>; -+ xlnx,addr-tag-bits = <0x10>; - xlnx,allow-dcache-wr = <0x1>; - xlnx,allow-icache-wr = <0x1>; - xlnx,area-optimized = <0x0>; -- xlnx,cache-byte-size = <0x2000>; -+ xlnx,cache-byte-size = <0x800>; - xlnx,d-lmb = <0x1>; - xlnx,d-opb = <0x0>; - xlnx,d-plb = <0x1>; - xlnx,data-size = <0x20>; -- xlnx,dcache-addr-tag = <0xf>; -- xlnx,dcache-always-used = <0x1>; -- xlnx,dcache-byte-size = <0x2000>; -+ xlnx,dcache-addr-tag = <0x10>; -+ xlnx,dcache-always-used = <0x0>; -+ xlnx,dcache-byte-size = <0x800>; - xlnx,dcache-line-len = <0x4>; - xlnx,dcache-use-fsl = <0x1>; - xlnx,debug-enabled = <0x1>; -- xlnx,div-zero-exception = <0x1>; -+ xlnx,div-zero-exception = <0x0>; - xlnx,dopb-bus-exception = <0x0>; - xlnx,dynamic-bus-sizing = <0x1>; - xlnx,edge-is-positive = <0x1>; -- xlnx,family = "virtex5"; -- xlnx,endianness = <0x1>; -- xlnx,fpu-exception = <0x1>; -+ xlnx,family = "spartan3adsp"; -+ xlnx,fpu-exception = <0x0>; - xlnx,fsl-data-size = <0x20>; - xlnx,fsl-exception = <0x0>; - xlnx,fsl-links = <0x0>; - xlnx,i-lmb = <0x1>; - xlnx,i-opb = <0x0>; - xlnx,i-plb = <0x1>; -- xlnx,icache-always-used = <0x1>; -+ xlnx,icache-always-used = <0x0>; - xlnx,icache-line-len = <0x4>; - xlnx,icache-use-fsl = <0x1>; -- xlnx,ill-opcode-exception = <0x1>; -+ xlnx,ill-opcode-exception = <0x0>; - xlnx,instance = "microblaze_0"; - xlnx,interconnect = <0x1>; - xlnx,interrupt-is-edge = <0x0>; -@@ -105,11 +75,11 @@ - xlnx,mmu-itlb-size = <0x2>; - xlnx,mmu-tlb-access = <0x3>; - xlnx,mmu-zones = <0x10>; -- xlnx,number-of-pc-brk = <0x1>; -- xlnx,number-of-rd-addr-brk = <0x0>; -- xlnx,number-of-wr-addr-brk = <0x0>; -- xlnx,opcode-0x0-illegal = <0x1>; -- xlnx,pvr = <0x2>; -+ xlnx,number-of-pc-brk = <0x3>; -+ xlnx,number-of-rd-addr-brk = <0x2>; -+ xlnx,number-of-wr-addr-brk = <0x2>; -+ xlnx,opcode-0x0-illegal = <0x0>; -+ xlnx,pvr = <0x1>; - xlnx,pvr-user1 = <0x0>; - xlnx,pvr-user2 = <0x0>; - xlnx,reset-msr = <0x0>; -@@ -117,29 +87,44 @@ - xlnx,unaligned-exceptions = <0x1>; - xlnx,use-barrel = <0x1>; - xlnx,use-dcache = <0x1>; -- xlnx,use-div = <0x1>; -+ xlnx,use-div = <0x0>; - xlnx,use-ext-brk = <0x1>; - xlnx,use-ext-nm-brk = <0x1>; - xlnx,use-extended-fsl-instr = <0x0>; -- xlnx,use-fpu = <0x2>; -- xlnx,use-hw-mul = <0x2>; -+ xlnx,use-fpu = <0x0>; -+ xlnx,use-hw-mul = <0x1>; - xlnx,use-icache = <0x1>; - xlnx,use-interrupt = <0x1>; - xlnx,use-mmu = <0x3>; - xlnx,use-msr-instr = <0x1>; - xlnx,use-pcmp-instr = <0x1>; -- } ; -- } ; -- mb_plb: plb@0 { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus"; -- ranges ; -- FLASH: flash@a0000000 { -- bank-width = <2>; -+ }; -+ }; -+ -+ plb@0 { -+ #address-cells = <0x1>; -+ #size-cells = <0x1>; -+ compatible = "xlnx,plb-v46-1.03.a", "simple-bus"; -+ ranges; -+ -+ ethernet@81000000 { -+ compatible = "xlnx,xps-ethernetlite-2.00.b"; -+ device_type = "network"; -+ interrupt-parent = <0x1>; -+ interrupts = <0x1 0x0>; -+ local-mac-address = [02 00 00 00 00 00]; -+ reg = <0x81000000 0x10000>; -+ xlnx,duplex = <0x1>; -+ xlnx,family = "spartan3adsp"; -+ xlnx,rx-ping-pong = <0x0>; -+ xlnx,tx-ping-pong = <0x0>; -+ }; -+ -+ flash@a0000000 { -+ bank-width = <0x1>; - compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash"; -- reg = < 0xa0000000 0x2000000 >; -- xlnx,family = "virtex5"; -+ reg = <0xa0000000 0x1000000>; -+ xlnx,family = "spartan3adsp"; - xlnx,include-datawidth-matching-0 = <0x1>; - xlnx,include-datawidth-matching-1 = <0x0>; - xlnx,include-datawidth-matching-2 = <0x0>; -@@ -147,9 +132,9 @@ - xlnx,include-negedge-ioregs = <0x0>; - xlnx,include-plb-ipif = <0x1>; - xlnx,include-wrbuf = <0x1>; -- xlnx,max-mem-width = <0x10>; -+ xlnx,max-mem-width = <0x8>; - xlnx,mch-native-dwidth = <0x20>; -- xlnx,mch-plb-clk-period-ps = <0x1f40>; -+ xlnx,mch-plb-clk-period-ps = <0x3e80>; - xlnx,mch-splb-awidth = <0x20>; - xlnx,mch0-accessbuf-depth = <0x10>; - xlnx,mch0-protocol = <0x0>; -@@ -163,7 +148,7 @@ - xlnx,mch3-accessbuf-depth = <0x10>; - xlnx,mch3-protocol = <0x0>; - xlnx,mch3-rddatabuf-depth = <0x10>; -- xlnx,mem0-width = <0x10>; -+ xlnx,mem0-width = <0x8>; - xlnx,mem1-width = <0x20>; - xlnx,mem2-width = <0x20>; - xlnx,mem3-width = <0x20>; -@@ -178,31 +163,31 @@ - xlnx,synch-pipedelay-1 = <0x2>; - xlnx,synch-pipedelay-2 = <0x2>; - xlnx,synch-pipedelay-3 = <0x2>; -- xlnx,tavdv-ps-mem-0 = <0x1adb0>; -+ xlnx,tavdv-ps-mem-0 = <0x11170>; - xlnx,tavdv-ps-mem-1 = <0x3a98>; - xlnx,tavdv-ps-mem-2 = <0x3a98>; - xlnx,tavdv-ps-mem-3 = <0x3a98>; -- xlnx,tcedv-ps-mem-0 = <0x1adb0>; -+ xlnx,tcedv-ps-mem-0 = <0x11170>; - xlnx,tcedv-ps-mem-1 = <0x3a98>; - xlnx,tcedv-ps-mem-2 = <0x3a98>; - xlnx,tcedv-ps-mem-3 = <0x3a98>; -- xlnx,thzce-ps-mem-0 = <0x88b8>; -+ xlnx,thzce-ps-mem-0 = <0x61a8>; - xlnx,thzce-ps-mem-1 = <0x1b58>; - xlnx,thzce-ps-mem-2 = <0x1b58>; - xlnx,thzce-ps-mem-3 = <0x1b58>; -- xlnx,thzoe-ps-mem-0 = <0x1b58>; -+ xlnx,thzoe-ps-mem-0 = <0x61a8>; - xlnx,thzoe-ps-mem-1 = <0x1b58>; - xlnx,thzoe-ps-mem-2 = <0x1b58>; - xlnx,thzoe-ps-mem-3 = <0x1b58>; -- xlnx,tlzwe-ps-mem-0 = <0x88b8>; -+ 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 = <0x2af8>; -+ 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 = <0x11170>; -+ xlnx,twp-ps-mem-0 = <0xafc8>; - xlnx,twp-ps-mem-1 = <0x2ee0>; - xlnx,twp-ps-mem-2 = <0x2ee0>; - xlnx,twp-ps-mem-3 = <0x2ee0>; -@@ -214,154 +199,83 @@ - xlnx,xcl2-writexfer = <0x1>; - xlnx,xcl3-linesize = <0x4>; - xlnx,xcl3-writexfer = <0x1>; -- } ; -- Hard_Ethernet_MAC: xps-ll-temac@81c00000 { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "xlnx,compound"; -- ranges ; -- ethernet@81c00000 { -- compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a"; -- device_type = "network"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 5 2 >; -- llink-connected = <&PIM3>; -- local-mac-address = [ 00 0a 35 00 00 00 ]; -- reg = < 0x81c00000 0x40 >; -- xlnx,bus2core-clk-ratio = <0x1>; -- xlnx,phy-type = <0x1>; -- xlnx,phyaddr = <0x1>; -- xlnx,rxcsum = <0x0>; -- xlnx,rxfifo = <0x1000>; -- xlnx,temac-type = <0x0>; -- xlnx,txcsum = <0x0>; -- xlnx,txfifo = <0x1000>; -- } ; -- } ; -- IIC_EEPROM: i2c@81600000 { -- compatible = "xlnx,xps-iic-2.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 6 2 >; -- reg = < 0x81600000 0x10000 >; -- xlnx,clk-freq = <0x7735940>; -- xlnx,family = "virtex5"; -- xlnx,gpo-width = <0x1>; -- xlnx,iic-freq = <0x186a0>; -- xlnx,scl-inertial-delay = <0x0>; -- xlnx,sda-inertial-delay = <0x0>; -- xlnx,ten-bit-adr = <0x0>; -- } ; -- LEDs_8Bit: gpio@81400000 { -+ }; -+ -+ gpio@81400000 { - compatible = "xlnx,xps-gpio-1.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 7 2 >; -- reg = < 0x81400000 0x10000 >; -+ 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 = "virtex5"; -+ xlnx,family = "spartan3adsp"; - xlnx,gpio-width = <0x8>; - xlnx,interrupt-present = <0x1>; -- xlnx,is-bidir = <0x1>; -+ xlnx,is-bidir = <0x0>; - xlnx,is-bidir-2 = <0x1>; - xlnx,is-dual = <0x0>; - xlnx,tri-default = <0xffffffff>; - xlnx,tri-default-2 = <0xffffffff>; -- #gpio-cells = <2>; -- gpio-controller; -- } ; -- -- gpio-leds { -- compatible = "gpio-leds"; -- -- heartbeat { -- label = "Heartbeat"; -- gpios = <&LEDs_8Bit 4 1>; -- linux,default-trigger = "heartbeat"; -- }; -- -- yellow { -- label = "Yellow"; -- gpios = <&LEDs_8Bit 5 1>; -- }; -- -- red { -- label = "Red"; -- gpios = <&LEDs_8Bit 6 1>; -- }; -- -- green { -- label = "Green"; -- gpios = <&LEDs_8Bit 7 1>; -- }; -- } ; -- RS232_Uart_1: serial@84000000 { -- clock-frequency = <125000000>; -+ }; -+ -+ serial@84000000 { -+ clock-frequency = <0x3b9aca0>; - compatible = "xlnx,xps-uartlite-1.00.a"; -- current-speed = <115200>; -+ current-speed = <0x1c200>; - device_type = "serial"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 8 0 >; -- port-number = <0>; -- reg = < 0x84000000 0x10000 >; -+ interrupt-parent = <0x1>; -+ interrupts = <0x3 0x0>; -+ port-number = <0x0>; -+ reg = <0x84000000 0x10000>; - xlnx,baudrate = <0x1c200>; - xlnx,data-bits = <0x8>; -- xlnx,family = "virtex5"; -+ xlnx,family = "spartan3adsp"; - xlnx,odd-parity = <0x0>; - xlnx,use-parity = <0x0>; -- } ; -- SysACE_CompactFlash: sysace@83600000 { -- compatible = "xlnx,xps-sysace-1.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 4 2 >; -- reg = < 0x83600000 0x10000 >; -- xlnx,family = "virtex5"; -- xlnx,mem-width = <0x10>; -- } ; -- debug_module: debug@84400000 { -+ }; -+ -+ debug@84400000 { - compatible = "xlnx,mdm-1.00.d"; -- reg = < 0x84400000 0x10000 >; -- xlnx,family = "virtex5"; -+ 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 = <1>; -- #size-cells = <1>; -- compatible = "xlnx,mpmc-4.02.a"; -- ranges ; -- PIM3: sdma@84600180 { -- compatible = "xlnx,ll-dma-1.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 2 2 1 2 >; -- reg = < 0x84600180 0x80 >; -- } ; -- } ; -- xps_intc_0: interrupt-controller@81800000 { -+ #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 = <0x100>; -- xlnx,num-intr-inputs = <0x9>; -- } ; -- xps_timer_1: timer@83c00000 { -+ 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 = <&xps_intc_0>; -- interrupts = < 3 2 >; -- reg = < 0x83c00000 0x10000 >; -+ interrupt-parent = <0x1>; -+ interrupts = <0x0 0x2>; -+ reg = <0x83c00000 0x10000>; - xlnx,count-width = <0x20>; -- xlnx,family = "virtex5"; -+ 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/toolchain/musl/Makefile b/toolchain/musl/Makefile index 2cce6bebc..f647939b5 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -12,6 +12,9 @@ endif ifeq ($(CPU_ARCH),mips64el) REAL_GNU_TARGET_NAME:= $(subst mips64el,mips,$(REAL_GNU_TARGET_NAME)) endif +ifeq ($(CPU_ARCH),microblazeel) +REAL_GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(REAL_GNU_TARGET_NAME)) +endif $(WRKBUILD)/.headers: (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ -- cgit v1.2.3