diff options
-rw-r--r-- | package/busybox/config/networking/Config.in | 2 | ||||
-rw-r--r-- | package/simpleinit/Makefile | 1 | ||||
-rw-r--r-- | package/u-boot-avr32/Makefile | 18 | ||||
-rw-r--r-- | package/u-boot-h8300/Makefile | 25 | ||||
-rw-r--r-- | package/u-boot/Makefile | 1 | ||||
-rw-r--r-- | target/arm/Makefile | 14 | ||||
-rw-r--r-- | target/arm/kernel/qemu-arm-spitz | 46 | ||||
-rw-r--r-- | target/arm/kernel/qemu-arm-terrier | 46 | ||||
-rw-r--r-- | target/arm/pcduino-3b/extlinux.conf | 4 | ||||
-rw-r--r-- | target/arm/pcduino-3b/genimage.cfg | 20 | ||||
-rw-r--r-- | target/arm/systems/pcduino-3b | 2 | ||||
-rw-r--r-- | target/arm/systems/qemu-arm-spitz | 11 | ||||
-rw-r--r-- | target/arm/systems/qemu-arm-terrier | 11 | ||||
-rw-r--r-- | target/config/Config.in.qemuopts | 8 | ||||
-rw-r--r-- | target/linux/Config.in.kernelcfg | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.ethernet | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.graphics | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.input | 10 | ||||
-rw-r--r-- | target/linux/config/Config.in.serial | 8 | ||||
-rw-r--r-- | toolchain/gdb/Makefile.inc | 2 | ||||
-rw-r--r-- | toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch | 32 |
21 files changed, 95 insertions, 177 deletions
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 028fbdba6..9ed63b71f 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -584,7 +584,7 @@ config BUSYBOX_IPLINK config BUSYBOX_FEATURE_IP_LINK_CAN bool "ip link set type can" - default y + default n help Configure CAN devices with "ip". diff --git a/package/simpleinit/Makefile b/package/simpleinit/Makefile index 4de28ba48..91fe5141f 100644 --- a/package/simpleinit/Makefile +++ b/package/simpleinit/Makefile @@ -20,6 +20,7 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual TARGET_CPPFLAGS+= -DCONFIG_USER_INIT_CONSOLE_SH +TARGET_CFLAGS+= -Wno-incompatible-pointer-types do-build: PATH='$(HOST_PATH)' \ diff --git a/package/u-boot-avr32/Makefile b/package/u-boot-avr32/Makefile index 2886ddd3c..ac2553467 100644 --- a/package/u-boot-avr32/Makefile +++ b/package/u-boot-avr32/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host -PKG_BUILDDEP:= u-boot-host +HOST_BUILDDEP:= gnutls-host openssl-host dtc-host +PKG_BUILDDEP:= u-boot-avr32-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ @@ -73,20 +73,6 @@ ifneq ($(OS_FOR_BUILD),Darwin) $(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin $(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin endif -ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) - $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) -endif -ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) - $(INSTALL_BIN) ./files/boot.script.clearfog $(FW_DIR) -endif -ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - $(INSTALL_BIN) $(WRKBUILD)/SPL $(FW_DIR) - $(INSTALL_BIN) ./files/boot.script.imx6 $(FW_DIR) -endif -ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) - $(CP) ./files/uEnv.txt.bbb $(FW_DIR)/uEnv.txt - $(INSTALL_BIN) $(WRKBUILD)/MLO $(FW_DIR) -endif include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/u-boot-h8300/Makefile b/package/u-boot-h8300/Makefile index bfd0824df..cf39d0ae9 100644 --- a/package/u-boot-h8300/Makefile +++ b/package/u-boot-h8300/Makefile @@ -3,24 +3,25 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= u-boot -# last working hash fa0e8426833edc1be3c2ea3acaf248157048a15a -PKG_VERSION:= h8300 -PKG_GIT:= branch +PKG_NAME:= u-boot-h8300 +PKG_VERSION:= 0.1 PKG_RELEASE:= 1 +PKG_HASH:= 65461cc0cab37251e2487c0f5d4ae34c7ca89767bdf790b9a863800206b83539 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host +HOST_BUILDDEP:= openssl-host dtc-host PKG_BUILDDEP:= u-boot-h8300-host -PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/uboot.git +PKG_SITES:= https://distfiles.openadk.org/ PKG_SYSTEM_DEPENDS:= hitachi-edosk2674 +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call HOST_template,U_BOOT_H8300,u-boot-h8300,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,U_BOOT_8300,u-boot-h8300,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) UBOOT:= u-boot.bin @@ -37,7 +38,7 @@ host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) -u-boot-hostinstall: +u-boot-h8300-hostinstall: $(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \ $(STAGING_HOST_DIR)/usr/bin @@ -48,15 +49,15 @@ do-build: (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ - GCC_HONOUR_COPTS=s $(MAKE)) + $(MAKE)) ifneq ($(OS_FOR_BUILD),Darwin) (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ - GCC_HONOUR_COPTS=s $(MAKE) env) + $(MAKE) env) endif -u-boot-install: +u-boot-h8300-install: $(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR) $(INSTALL_DIR) $(IDIR_U_BOOT)/etc $(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 79ffd8a04..5162ada34 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -39,6 +39,7 @@ UBOOT:= u-boot.img endif ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) CONFIG:= Linksprite_pcDuino3_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig diff --git a/target/arm/Makefile b/target/arm/Makefile index 9ce20ef4f..9ca6969a1 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -23,12 +23,6 @@ QEMU_ARGS:=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) QEMU_ARGS+=-M xilinx-zynq-a9 -dtb $(FW_DIR)/zynq-zc702.dtb -serial null -serial mon:stdio endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y) -QEMU_ARGS+=-M spitz -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y) -QEMU_ARGS+=-M terrier -endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb endif @@ -50,7 +44,7 @@ ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "#################################################" @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -208,6 +202,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) VENDOR:=allwinner/ endif +ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) +VENDOR:=allwinner/ +endif endif dtb-install: @@ -250,6 +247,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) ${KERNEL_MAKE} $(VENDOR)sun7i-a20-bananapro.dtb $(MAKE_TRACE) endif +ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) + ${KERNEL_MAKE} $(VENDOR)sun7i-a20-pcduino3.dtb $(MAKE_TRACE) +endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) ${KERNEL_MAKE} sun8i-h2-plus-orangepi-zero.dtb $(MAKE_TRACE) endif diff --git a/target/arm/kernel/qemu-arm-spitz b/target/arm/kernel/qemu-arm-spitz deleted file mode 100644 index 09a1d76ff..000000000 --- a/target/arm/kernel/qemu-arm-spitz +++ /dev/null @@ -1,46 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARCH_PXA=y -CONFIG_PXA_SHARPSL=y -CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y -CONFIG_MACH_SPITZ=y -CONFIG_PXA27x=y -CONFIG_PXA_SHARP_Cxx00=y -CONFIG_SHARPSL_PM=y -CONFIG_SHARPSL_PM_MAX1111=y -CONFIG_PXA_SSP=y -CONFIG_PLAT_PXA=y -CONFIG_CPU_XSCALE=y -CONFIG_IWMMXT=y -CONFIG_XSCALE_PMU=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_SHARP_PARAM=y -CONFIG_SHARP_SCOOP=y -CONFIG_ATAGS=y -CONFIG_ATAGS_PROC=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_PXA=y -CONFIG_POWER_SUPPLY=y -CONFIG_PDA_POWER=y -CONFIG_APM_POWER=y -CONFIG_SENSORS_MAX1111=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_CORGI=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -CONFIG_HID=y -CONFIG_HID_GENERIC=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_NON8250=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y diff --git a/target/arm/kernel/qemu-arm-terrier b/target/arm/kernel/qemu-arm-terrier deleted file mode 100644 index e8a01e232..000000000 --- a/target/arm/kernel/qemu-arm-terrier +++ /dev/null @@ -1,46 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARCH_PXA=y -CONFIG_PXA_SHARPSL=y -CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y -CONFIG_MACH_BORZOI=y -CONFIG_PXA27x=y -CONFIG_PXA_SHARP_Cxx00=y -CONFIG_SHARPSL_PM=y -CONFIG_SHARPSL_PM_MAX1111=y -CONFIG_PXA_SSP=y -CONFIG_PLAT_PXA=y -CONFIG_CPU_XSCALE=y -CONFIG_IWMMXT=y -CONFIG_XSCALE_PMU=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_SHARP_PARAM=y -CONFIG_SHARP_SCOOP=y -CONFIG_ATAGS=y -CONFIG_ATAGS_PROC=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_PXA=y -CONFIG_POWER_SUPPLY=y -CONFIG_PDA_POWER=y -CONFIG_APM_POWER=y -CONFIG_SENSORS_MAX1111=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_CORGI=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -CONFIG_HID=y -CONFIG_HID_GENERIC=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_NON8250=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y diff --git a/target/arm/pcduino-3b/extlinux.conf b/target/arm/pcduino-3b/extlinux.conf new file mode 100644 index 000000000..dbbb487c0 --- /dev/null +++ b/target/arm/pcduino-3b/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/kernel + devicetreedir /boot + append root=PARTUUID=f6c8cabe-f191-4392-89bb-2ba14119482e rootwait console=${console} rootfstype=ext4 panic=10 diff --git a/target/arm/pcduino-3b/genimage.cfg b/target/arm/pcduino-3b/genimage.cfg new file mode 100644 index 000000000..9d2d124f1 --- /dev/null +++ b/target/arm/pcduino-3b/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = "gpt" + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + partition rootfs { + offset = 1M + image = "rootfs.ext" + partition-uuid = f6c8cabe-f191-4392-89bb-2ba14119482e + } +} diff --git a/target/arm/systems/pcduino-3b b/target/arm/systems/pcduino-3b index 71763d2e1..c146b59c0 100644 --- a/target/arm/systems/pcduino-3b +++ b/target/arm/systems/pcduino-3b @@ -12,7 +12,7 @@ config ADK_TARGET_SYSTEM_PCDUINO_3B select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK - select ADK_TARGET_KERNEL_IMAGE + select ADK_TARGET_KERNEL_ZIMAGE select ADK_PACKAGE_U_BOOT help PCduino 3b diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz deleted file mode 100644 index d97c5868e..000000000 --- a/target/arm/systems/qemu-arm-spitz +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ - bool "Qemu Emulator (Spitz PDA)" - depends on ADK_TARGET_OS_LINUX - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_XSCALE - select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for ARM architecture (Spitz PDA). - diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier deleted file mode 100644 index 2fe25fc0f..000000000 --- a/target/arm/systems/qemu-arm-terrier +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER - bool "Qemu Emulator (Terrier PDA)" - depends on ADK_TARGET_OS_LINUX - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_XSCALE - select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for ARM architecture (Terrier PDA). - diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 177fa6756..1e38fa7d7 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -4,14 +4,8 @@ config ADK_QEMU_ARGS string default "-vga std" if ADK_TARGET_QEMU_WITH_GRAPHIC - default "" if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY default "-nographic" -config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY - bool - select ADK_TARGET_WITH_VGA - depends on ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER - config ADK_TARGET_QEMU_WITH_BLOCK bool select ADK_TARGET_WITH_BLOCK @@ -29,8 +23,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK select ADK_LINUX_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC select ADK_LINUX_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64 select ADK_LINUX_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH - select ADK_LINUX_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \ - || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER select ADK_LINUX_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 select ADK_LINUX_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index 99cd55de2..f8d33d5b7 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -50,6 +50,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "sunxi_defconfig" if ADK_TARGET_SYSTEM_ORANGE_PI0 default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_P2_ZERO default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_PRO + default "sunxi_defconfig" if ADK_TARGET_SYSTEM_PCDUINO_3B default "edosk2674_defconfig" if ADK_TARGET_SYSTEM_HITACHI_EDOSK2674 default "x86_64_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86_64 default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86 diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 7c3a617ed..1a9909a95 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -9,6 +9,9 @@ config ADK_LINUX_KERNEL_NET_ETHERNET bool default y +config ADK_LINUX_KERNEL_NET_CADENCE + bool + config ADK_LINUX_KERNEL_NET_VENDOR_CADENCE bool @@ -438,6 +441,7 @@ config ADK_LINUX_KERNEL_IBMVETH config ADK_LINUX_KERNEL_MACB tristate "Cadence MACB network driver" select ADK_LINUX_KERNEL_NET_VENDOR_CADENCE + select ADK_LINUX_KERNEL_NET_CADENCE depends on ADK_TARGET_CPU_AVR32 \ || ADK_TARGET_SYSTEM_RASPBERRY_PI5 \ || ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 11e94db68..8d080b377 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -279,12 +279,8 @@ config ADK_LINUX_KERNEL_FB_PXA select ADK_LINUX_KERNEL_DUMMY_CONSOLE select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION - depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \ - || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \ - || ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ + depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER - default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ default n help Framebuffer support for Sharp Zaurus CL Series. diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 7d4932e41..1342ccf8b 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -33,8 +33,6 @@ config ADK_LINUX_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ - default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C default n @@ -57,15 +55,11 @@ config ADK_LINUX_KERNEL_MOUSE_ATARI config ADK_LINUX_KERNEL_KEYBOARD_GPIO bool default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ - default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default n config ADK_LINUX_KERNEL_KEYBOARD_MATRIX bool default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ - default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default n config ADK_LINUX_KERNEL_INPUT_TOUCHSCREEN @@ -82,8 +76,6 @@ config ADK_LINUX_KERNEL_INPUT_KEYBOARD default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ - default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C default n @@ -92,8 +84,6 @@ config ADK_LINUX_KERNEL_INPUT_MOUSE default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ - default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C default n diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 39470b7f7..db4c1d999 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -119,7 +119,8 @@ config ADK_LINUX_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_SYNOPSYS_HSDK \ || ADK_TARGET_SYSTEM_SOM_C6745 \ || ADK_TARGET_SYSTEM_ROCKPI4_PLUS \ - || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 + || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 \ + || ADK_TARGET_SYSTEM_PCDUINO_3B select ADK_LINUX_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ORANGE_PI0 @@ -128,6 +129,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ROCKPI4_PLUS select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_BANANA_PRO + select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_PCDUINO_3B select ADK_LINUX_KERNEL_SERIAL_8250_EXTENDED if ADK_TARGET_SYSTEM_VISIONFIVE2 select ADK_LINUX_KERNEL_SERIAL_8250_DMA if ADK_TARGET_SYSTEM_ORANGE_PI0 select ADK_LINUX_KERNEL_SERIAL_8250_INGENIC if ADK_TARGET_SYSTEM_IMGTEC_CI20 @@ -173,7 +175,8 @@ config ADK_LINUX_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 \ || ADK_TARGET_SYSTEM_ROCKPI4_PLUS \ || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 \ - || ADK_TARGET_SYSTEM_BANANA_PRO + || ADK_TARGET_SYSTEM_BANANA_PRO \ + || ADK_TARGET_SYSTEM_PCDUINO_3B default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 default y if ADK_TARGET_SYSTEM_IMGTEC_CI20 default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 @@ -211,6 +214,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default y if ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 default y if ADK_TARGET_SYSTEM_BANANA_PRO + default y if ADK_TARGET_SYSTEM_PCDUINO_3B default n help Serial driver for 8250 UART chip. diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc index 0fac2ecb9..e8e29d4c3 100644 --- a/toolchain/gdb/Makefile.inc +++ b/toolchain/gdb/Makefile.inc @@ -42,7 +42,7 @@ ifeq ($(ADK_TOOLCHAIN_GDB_H8300_GIT),y) PKG_VERSION:= ysato-h8300 PKG_RELEASE:= 1 PKG_GIT:= branch -PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/binutils_gdb.git +PKG_SITES:= https://github.com/ysat0/binutils-gdb.git DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif ifeq ($(ADK_TOOLCHAIN_GDB_GIT),y) diff --git a/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch b/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch new file mode 100644 index 000000000..bbae1d774 --- /dev/null +++ b/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch @@ -0,0 +1,32 @@ +--- a/sim/common/sim-arange.c ++++ b/sim/common/sim-arange.c +@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a + build_search_tree (ar); + } + +-#endif /* DEFINE_NON_INLINE_P */ +- +-#if DEFINE_INLINE_P +- +-SIM_ARANGE_INLINE int ++int + sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr) + { + ADDR_RANGE_TREE *t = ar->range_tree; +@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad + return 0; + } + +-#endif /* DEFINE_INLINE_P */ ++#endif /* DEFINE_NON_INLINE_P */ +--- a/sim/common/sim-arange.h ++++ b/sim/common/sim-arange.h +@@ -62,7 +62,7 @@ extern void sim_addr_range_delete (ADDR_ + + /* Return non-zero if ADDR is in range AR, traversing the entire tree. + If no range is specified, that is defined to mean "everything". */ +-extern INLINE int ++extern int + sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); + #define ADDR_RANGE_HIT_P(ar, addr) \ + ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) |