From 623680d57c3c8271bd77b01a4808b6ab031886fc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 4 Jun 2015 04:41:02 -0500 Subject: add some bits and bytes to allow to choose bfin-sim. not functional, yet --- target/bfin/kernel/sim-bfin | 3 +++ target/bfin/systems/sim-bfin | 9 +++++++++ target/config/Config.in | 3 +++ target/config/Config.in.binutils.choice | 1 - target/config/Config.in.cpu | 23 +++++++++++++++++++++++ target/config/Config.in.gcc.choice | 5 ++--- target/config/Config.in.kernel | 1 + target/config/Config.in.tc | 2 +- toolchain/gcc/Makefile.inc | 6 +++--- toolchain/gdb/Makefile | 5 ++++- 10 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 target/bfin/kernel/sim-bfin create mode 100644 target/bfin/systems/sim-bfin diff --git a/target/bfin/kernel/sim-bfin b/target/bfin/kernel/sim-bfin new file mode 100644 index 000000000..b0cbf7edb --- /dev/null +++ b/target/bfin/kernel/sim-bfin @@ -0,0 +1,3 @@ +CONFIG_BLACKFIN=y +CONFIG_BF542_std=y +CONFIG_ICACHE_FLUSH_L1=y diff --git a/target/bfin/systems/sim-bfin b/target/bfin/systems/sim-bfin new file mode 100644 index 000000000..68f7beefc --- /dev/null +++ b/target/bfin/systems/sim-bfin @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_SIM_BFIN + bool "GDB simulator" + select ADK_CPU_BFIN + select ADK_TARGET_UCLINUX + select ADK_TARGET_SIM + select ADK_TARGET_PACKAGE_TXZ + help + BFIN Simulator. + diff --git a/target/config/Config.in b/target/config/Config.in index 167efffac..cab327e50 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -19,6 +19,9 @@ config ADK_TARGET_UCLINUX select ADK_PACKAGE_SASH select ADK_PACKAGE_SIMPLEINIT +config ADK_TARGET_SIM + bool + config ADK_TARGET_QEMU bool select ADK_TARGET_WITH_SERIAL diff --git a/target/config/Config.in.binutils.choice b/target/config/Config.in.binutils.choice index ebcd4f41e..68933fc77 100644 --- a/target/config/Config.in.binutils.choice +++ b/target/config/Config.in.binutils.choice @@ -11,7 +11,6 @@ default ADK_TOOLCHAIN_BINUTILS_2_25 config ADK_TOOLCHAIN_BINUTILS_GIT bool "git" - depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 020a26887..d95a5da4a 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -687,6 +687,29 @@ config ADK_TARGET_CPU_FLAGS default "-mcpu=bf522" if ADK_CPU_BF522 default "-mcpu=bf523" if ADK_CPU_BF523 default "-mcpu=bf524" if ADK_CPU_BF524 + default "-mcpu=bf525" if ADK_CPU_BF525 + default "-mcpu=bf526" if ADK_CPU_BF526 + default "-mcpu=bf527" if ADK_CPU_BF527 + default "-mcpu=bf531" if ADK_CPU_BF531 + default "-mcpu=bf532" if ADK_CPU_BF532 + default "-mcpu=bf533" if ADK_CPU_BF533 + default "-mcpu=bf534" if ADK_CPU_BF534 + default "-mcpu=bf536" if ADK_CPU_BF536 + default "-mcpu=bf537" if ADK_CPU_BF537 + default "-mcpu=bf538" if ADK_CPU_BF538 + default "-mcpu=bf539" if ADK_CPU_BF539 + default "-mcpu=bf542" if ADK_CPU_BF542 + default "-mcpu=bf544" if ADK_CPU_BF544 + default "-mcpu=bf547" if ADK_CPU_BF547 + default "-mcpu=bf548" if ADK_CPU_BF548 + default "-mcpu=bf549" if ADK_CPU_BF549 + default "-mcpu=bf542m" if ADK_CPU_BF542M + default "-mcpu=bf544m" if ADK_CPU_BF544M + default "-mcpu=bf547m" if ADK_CPU_BF547M + default "-mcpu=bf548m" if ADK_CPU_BF548M + default "-mcpu=bf549m" if ADK_CPU_BF549M + default "-mcpu=bf561" if ADK_CPU_BF561 + default "-mcpu=bf592" if ADK_CPU_BF592 default "-mcpu=v10" if ADK_CPU_CRIS_V10 default "-mcpu=v32" if ADK_CPU_CRIS_V32 default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE diff --git a/target/config/Config.in.gcc.choice b/target/config/Config.in.gcc.choice index 39d4e75b5..1d4d05c11 100644 --- a/target/config/Config.in.gcc.choice +++ b/target/config/Config.in.gcc.choice @@ -11,7 +11,6 @@ default ADK_TOOLCHAIN_GCC_4_9_2 config ADK_TOOLCHAIN_GCC_GIT bool "git" - depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_AVR32 @@ -48,8 +47,8 @@ config ADK_TOOLCHAIN_GCC_4_7_4 depends on ADK_TARGET_ARCH_C6X \ || ADK_TARGET_ARCH_SPARC -config ADK_TOOLCHAIN_GCC_4_5_4 - bool "4.5.4" +config ADK_TOOLCHAIN_GCC_4_6_3 + bool "4.6.3" depends on ADK_TARGET_ARCH_BFIN config ADK_TOOLCHAIN_GCC_4_4_7 diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index ace5bb563..0e256deee 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -78,3 +78,4 @@ config ADK_TARGET_KERNEL_MINICONFIG default "banana-pro" if ADK_TARGET_SYSTEM_BANANA_PRO default "xilinx-kintex7" if ADK_TARGET_SYSTEM_XILINX_KINTEX7 default "pcengines-alix" if ADK_TARGET_SYSTEM_PCENGINES_ALIX + default "sim-bfin" if ADK_TARGET_SYSTEM_SIM_BFIN diff --git a/target/config/Config.in.tc b/target/config/Config.in.tc index 32743d0d0..80b370eb6 100644 --- a/target/config/Config.in.tc +++ b/target/config/Config.in.tc @@ -3,7 +3,7 @@ choice ADK_TARGET_CPU prompt "CPU type" -depends on ADK_TARGET_TOOLCHAIN && \ +depends on (ADK_TARGET_TOOLCHAIN || ADK_TARGET_SIM) && \ ( ADK_TARGET_ARCH_CRIS \ || ADK_TARGET_ARCH_AARCH64 \ || ADK_TARGET_ARCH_ARC \ diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 27a2a33f2..78716b372 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -43,9 +43,9 @@ PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz LIBSTDCXXVER:= 17 endif -ifeq ($(ADK_TOOLCHAIN_GCC_4_5_4),y) -PKG_VERSION:= 4.5.4 -PKG_HASH:= 33fb968907ef7b6c528f6395ba049eb34c4df859bf5aa6c2bc3856268801e078 +ifeq ($(ADK_TOOLCHAIN_GCC_4_6_3),y) +PKG_VERSION:= 4.6.3 +PKG_HASH:= 3122a8f1a30106034ec70bad633c3fd899d8b6a1216c723f0f03be22c2fe65b0 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index a617424f1..f311790f0 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -29,7 +29,7 @@ $(WRKBUILD)/.configured: --disable-nls \ --with-curses \ --enable-threads \ - --disable-sim \ + --enable-sim \ --disable-tui \ --disable-werror \ --disable-install-libiberty \ @@ -44,6 +44,9 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.installed: $(INSTALL_BIN) $(WRKBUILD)/gdb/gdb $(TARGET_CROSS)gdb +ifeq ($(ADK_TARGET_ARCH_BFIN),y) + $(INSTALL_BIN) $(WRKBUILD)/sim/bfin/run $(TARGET_CROSS)run +endif touch $@ include ${ADK_TOPDIR}/mk/toolchain.mk -- cgit v1.2.3