From 88316abca1ebadc147afa21d7a2b60eec9af8e01 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Tue, 20 Nov 2012 15:38:32 +0100 Subject: [PATCH] Merge panda_a2 and panda SPEC (fix #505, fix #506) There is no obvious reason for having two different SPEC variables, definitions, and pathes for the Pandaboard platform. It even lead to problems regarding the omap4 framebuffer driver (look at issue #505 and #506). --- base-hw/doc/hw.txt | 4 ++-- base-hw/doc/{panda_a2.txt => panda.txt} | 0 .../core_support.mk | 2 +- .../platform_support.mk | 2 +- .../{spec-hw_panda_a2.mk => spec-hw_panda.mk} | 4 ++-- .../core/{panda_a2 => panda}/kernel_support.h | 0 .../{panda_a2 => panda}/platform_support.cc | 0 base-hw/src/core/{panda_a2 => panda}/target.mk | 2 +- base-hw/src/core/{panda_a2 => panda}/tlb.h | 0 .../{panda_a2 => panda}/drivers/board.h | 0 base/mk/spec-platform_panda.mk | 4 +++- base/mk/spec-platform_panda_a2.mk | 17 ----------------- ...ild.conf.hw_panda_a2 => build.conf.hw_panda} | 0 tool/create_builddir | 8 ++++---- 14 files changed, 14 insertions(+), 29 deletions(-) rename base-hw/doc/{panda_a2.txt => panda.txt} (100%) rename base-hw/lib/mk/{platform_panda_a2 => platform_panda}/core_support.mk (88%) rename base-hw/lib/mk/{platform_panda_a2 => platform_panda}/platform_support.mk (86%) rename base-hw/mk/{spec-hw_panda_a2.mk => spec-hw_panda.mk} (77%) rename base-hw/src/core/{panda_a2 => panda}/kernel_support.h (100%) rename base-hw/src/core/{panda_a2 => panda}/platform_support.cc (100%) rename base-hw/src/core/{panda_a2 => panda}/target.mk (87%) rename base-hw/src/core/{panda_a2 => panda}/tlb.h (100%) rename base/include/platform/{panda_a2 => panda}/drivers/board.h (100%) delete mode 100644 base/mk/spec-platform_panda_a2.mk rename tool/builddir/etc/{build.conf.hw_panda_a2 => build.conf.hw_panda} (100%) diff --git a/base-hw/doc/hw.txt b/base-hw/doc/hw.txt index 1dd044e648..00b7b66d83 100644 --- a/base-hw/doc/hw.txt +++ b/base-hw/doc/hw.txt @@ -19,7 +19,7 @@ is one of the following: 'pbxa9' - Realview PBXA9 'vea9x4' - Versatile Express A9X4 'imx31' - Freescale i.MX31 -'panda_a2' - PandaBoard A2 +'panda' - PandaBoard A2 Prerequisites @@ -64,7 +64,7 @@ you aim at: 'pbxa9' - Realview PBXA9 'vea9x4' - Versatile Express A9X4 'imx31' - Freescale i.MX31 -'panda_a2' - PandaBoard A2 +'panda' - PandaBoard A2 Please notice that not all of these targets might be emulateable with Qemu. To be on the safe side use 'pbxa9'. For informations about how to boot diff --git a/base-hw/doc/panda_a2.txt b/base-hw/doc/panda.txt similarity index 100% rename from base-hw/doc/panda_a2.txt rename to base-hw/doc/panda.txt diff --git a/base-hw/lib/mk/platform_panda_a2/core_support.mk b/base-hw/lib/mk/platform_panda/core_support.mk similarity index 88% rename from base-hw/lib/mk/platform_panda_a2/core_support.mk rename to base-hw/lib/mk/platform_panda/core_support.mk index f1f4bf372a..a6d7a9fa3c 100644 --- a/base-hw/lib/mk/platform_panda_a2/core_support.mk +++ b/base-hw/lib/mk/platform_panda/core_support.mk @@ -5,7 +5,7 @@ # # declare location of core files that are board specific -BOARD_DIR = $(REP_DIR)/src/core/panda_a2 +BOARD_DIR = $(REP_DIR)/src/core/panda # include generic parts of core support include $(REP_DIR)/lib/mk/arm_v7/core_support.inc diff --git a/base-hw/lib/mk/platform_panda_a2/platform_support.mk b/base-hw/lib/mk/platform_panda/platform_support.mk similarity index 86% rename from base-hw/lib/mk/platform_panda_a2/platform_support.mk rename to base-hw/lib/mk/platform_panda/platform_support.mk index 521c0b917a..ff42f0bad4 100644 --- a/base-hw/lib/mk/platform_panda_a2/platform_support.mk +++ b/base-hw/lib/mk/platform_panda/platform_support.mk @@ -13,5 +13,5 @@ SRC_CC += platform_services.cc platform_support.cc # declare source paths vpath platform_services.cc $(BASE_DIR)/src/core -vpath platform_support.cc $(REP_DIR)/src/core/panda_a2 +vpath platform_support.cc $(REP_DIR)/src/core/panda diff --git a/base-hw/mk/spec-hw_panda_a2.mk b/base-hw/mk/spec-hw_panda.mk similarity index 77% rename from base-hw/mk/spec-hw_panda_a2.mk rename to base-hw/mk/spec-hw_panda.mk index 6ce54a29f1..39497bee4f 100644 --- a/base-hw/mk/spec-hw_panda_a2.mk +++ b/base-hw/mk/spec-hw_panda.mk @@ -5,11 +5,11 @@ # # denote wich specs are also fullfilled by this spec -SPECS += hw platform_panda_a2 +SPECS += hw platform_panda # set address where to link the text segment at LD_TEXT_ADDR ?= 0x80000000 # include implied specs include $(call select_from_repositories,mk/spec-hw.mk) -include $(call select_from_repositories,mk/spec-platform_panda_a2.mk) +include $(call select_from_repositories,mk/spec-platform_panda.mk) diff --git a/base-hw/src/core/panda_a2/kernel_support.h b/base-hw/src/core/panda/kernel_support.h similarity index 100% rename from base-hw/src/core/panda_a2/kernel_support.h rename to base-hw/src/core/panda/kernel_support.h diff --git a/base-hw/src/core/panda_a2/platform_support.cc b/base-hw/src/core/panda/platform_support.cc similarity index 100% rename from base-hw/src/core/panda_a2/platform_support.cc rename to base-hw/src/core/panda/platform_support.cc diff --git a/base-hw/src/core/panda_a2/target.mk b/base-hw/src/core/panda/target.mk similarity index 87% rename from base-hw/src/core/panda_a2/target.mk rename to base-hw/src/core/panda/target.mk index 91619fc117..1b7b9e272e 100644 --- a/base-hw/src/core/panda_a2/target.mk +++ b/base-hw/src/core/panda/target.mk @@ -5,7 +5,7 @@ # # declare wich specs must be given to build this target -REQUIRES += platform_panda_a2 +REQUIRES += platform_panda # include less specific target parts include $(REP_DIR)/src/core/target.inc diff --git a/base-hw/src/core/panda_a2/tlb.h b/base-hw/src/core/panda/tlb.h similarity index 100% rename from base-hw/src/core/panda_a2/tlb.h rename to base-hw/src/core/panda/tlb.h diff --git a/base/include/platform/panda_a2/drivers/board.h b/base/include/platform/panda/drivers/board.h similarity index 100% rename from base/include/platform/panda_a2/drivers/board.h rename to base/include/platform/panda/drivers/board.h diff --git a/base/mk/spec-platform_panda.mk b/base/mk/spec-platform_panda.mk index 7fee810a49..b374b7bbd5 100644 --- a/base/mk/spec-platform_panda.mk +++ b/base/mk/spec-platform_panda.mk @@ -1,7 +1,7 @@ # # Enable peripherals of the platform # -SPECS += omap4 usb +SPECS += omap4 usb cortex_a9 tl16c750 platform_panda # # Pull in CPU specifics @@ -13,4 +13,6 @@ SPECS += arm_v7a # REP_INC_DIR += include/platform/panda +include $(call select_from_repositories,mk/spec-cortex_a9.mk) +include $(call select_from_repositories,mk/spec-tl16c750.mk) include $(call select_from_repositories,mk/spec-arm_v7a.mk) diff --git a/base/mk/spec-platform_panda_a2.mk b/base/mk/spec-platform_panda_a2.mk deleted file mode 100644 index 2ea29ffc4a..0000000000 --- a/base/mk/spec-platform_panda_a2.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# \brief Build-system configurations specifically for the PandaBoard A2 -# \author Martin Stein -# \date 2011-12-20 -# - -# denote wich specs are also fullfilled by this spec -SPECS += cortex_a9 tl16c750 omap4 platform_panda - -# add repository relative include paths -REP_INC_DIR += include/platform/panda_a2 - -# include implied specs -include $(call select_from_repositories,mk/spec-platform_panda.mk) -include $(call select_from_repositories,mk/spec-cortex_a9.mk) -include $(call select_from_repositories,mk/spec-tl16c750.mk) - diff --git a/tool/builddir/etc/build.conf.hw_panda_a2 b/tool/builddir/etc/build.conf.hw_panda similarity index 100% rename from tool/builddir/etc/build.conf.hw_panda_a2 rename to tool/builddir/etc/build.conf.hw_panda diff --git a/tool/create_builddir b/tool/create_builddir index 54da2887be..3dd201b54d 100755 --- a/tool/create_builddir +++ b/tool/create_builddir @@ -27,7 +27,7 @@ usage: @echo " 'nova_x86_64'" @echo " 'codezero_vpb926'" @echo " 'mb_s3a_starter_kit'" - @echo " 'hw_panda_a2'" + @echo " 'hw_panda'" @echo " 'hw_vea9x4'" @echo " 'hw_pbxa9'" @echo " 'foc_x86_32'" @@ -132,7 +132,7 @@ endif # # Add ARM drivers repositories to ARM build directories # -ifeq ($(filter-out foc_panda,$(PLATFORM)),) +ifeq ($(filter-out foc_panda hw_panda,$(PLATFORM)),) $(BUILD_DIR)/etc/build.conf:: @cat $(BUILD_CONF).drivers_arm >> $@ endif @@ -186,8 +186,8 @@ hw_pbxa9:: hw_vea9x4:: @echo "SPECS = genode hw_vea9x4" > $(BUILD_DIR)/etc/specs.conf -hw_panda_a2:: - @echo "SPECS = genode hw_panda_a2" > $(BUILD_DIR)/etc/specs.conf +hw_panda:: + @echo "SPECS = genode hw_panda" > $(BUILD_DIR)/etc/specs.conf lx_hybrid_x86:: @echo "CROSS_DEV_PREFIX =" > $(BUILD_DIR)/etc/tools.conf