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

@@ -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

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

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
 

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)

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

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)

base/mk/spec-platform_panda_a2.mk

@@ -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)
-

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