Skip to content

Commit

Permalink
base: remove SPEC variables of boards
Browse files Browse the repository at this point in the history 
Issue genodelabs/genode#3971
  • Loading branch information
@skalk
skalk committed Jan 26, 2021
1 parent 81012fe commit ce88df8
Show file tree
Hide file tree
Showing 72 changed files with 299 additions and 348 deletions.
1 change: 1 addition & 0 deletions board/zynq_parallella/image_link_address
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x00100000
1 change: 1 addition & 0 deletions board/zynq_zc702/image_link_address
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x00100000
1 change: 1 addition & 0 deletions board/zynq_zc706/image_link_address
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x00100000
1 change: 1 addition & 0 deletions board/zynq_zedboard/image_link_address
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x00100000
8 changes: 4 additions & 4 deletions lib/mk/spec/arm_v7/bootstrap-hw-arndale.mk
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
INC_DIR += $(REP_DIR)/src/bootstrap/spec/arndale
INC_DIR += $(REP_DIR)/src/bootstrap/board/arndale
INC_DIR += $(REP_DIR)/src/include

SRC_CC += bootstrap/board/arndale/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += bootstrap/spec/arm/cortex_a15_cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc
SRC_CC += bootstrap/spec/arndale/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
SRC_S += bootstrap/spec/arm/crt0.s

Expand All @@ -18,4 +18,4 @@ CC_MARCH = -mcpu=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp

include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)

vpath bootstrap/spec/arndale/platform.cc $(REP_DIR)/src
vpath bootstrap/board/arndale/platform.cc $(REP_DIR)/src
8 changes: 5 additions & 3 deletions lib/mk/spec/arm_v7/bootstrap-hw-odroid_xu.mk
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
INC_DIR += $(REP_DIR)/src/bootstrap/spec/odroid_xu
INC_DIR += $(REP_DIR)/src/bootstrap/board/odroid_xu

SRC_CC += bootstrap/board/odroid_xu/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += bootstrap/spec/arm/cortex_a15_cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc
SRC_CC += bootstrap/spec/odroid_xu/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
SRC_S += bootstrap/spec/arm/crt0.s

include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)

vpath bootstrap/board/odroid_xu/platform.cc $(REP_DIR)/src
10 changes: 5 additions & 5 deletions lib/mk/spec/arm_v7/bootstrap-hw-panda.mk
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
NR_OF_CPUS = 2

INC_DIR += $(REP_DIR)/src/bootstrap/spec/panda
INC_DIR += $(REP_DIR)/src/bootstrap/board/panda
INC_DIR += $(REP_DIR)/src/include
SRC_CC += bootstrap/spec/arm/cpu.cc
SRC_CC += bootstrap/board/panda/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += bootstrap/spec/arm/cortex_a9_mmu.cc
SRC_CC += bootstrap/spec/arm/cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc
SRC_CC += bootstrap/spec/panda/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += hw/spec/32bit/memory_map.cc
SRC_S += bootstrap/spec/arm/crt0.s

CC_MARCH = -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=softfp

include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)

vpath bootstrap/spec/panda/platform.cc $(REP_DIR)/src
vpath bootstrap/board/panda/platform.cc $(REP_DIR)/src
21 changes: 21 additions & 0 deletions lib/mk/spec/arm_v7/bootstrap-hw-zynq_parallella.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)

INC_DIR += $(REP_DIR)/src/bootstrap/board/zynq_parallella

SRC_S += bootstrap/spec/arm/crt0.s

SRC_CC += bootstrap/board/zynq_qemu/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += bootstrap/spec/arm/cortex_a9_mmu.cc
SRC_CC += bootstrap/spec/arm/cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc
SRC_CC += hw/spec/32bit/memory_map.cc

NR_OF_CPUS = 2

vpath bootstrap/board/zynq_qemu/platform.cc $(BASE_HW_DIR)/src/

include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc

CC_CXX_WARN_STRICT =
21 changes: 21 additions & 0 deletions lib/mk/spec/arm_v7/bootstrap-hw-zynq_zc702.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)

INC_DIR += $(REP_DIR)/src/bootstrap/board/zynq_zc702

SRC_S += bootstrap/spec/arm/crt0.s

SRC_CC += bootstrap/board/zynq_qemu/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += bootstrap/spec/arm/cortex_a9_mmu.cc
SRC_CC += bootstrap/spec/arm/cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc
SRC_CC += hw/spec/32bit/memory_map.cc

NR_OF_CPUS = 2

vpath bootstrap/board/zynq_qemu/platform.cc $(BASE_HW_DIR)/src/

include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc

CC_CXX_WARN_STRICT =
21 changes: 21 additions & 0 deletions lib/mk/spec/arm_v7/bootstrap-hw-zynq_zc706.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)

INC_DIR += $(REP_DIR)/src/bootstrap/board/zynq_zc706

SRC_S += bootstrap/spec/arm/crt0.s

SRC_CC += bootstrap/board/zynq_qemu/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += bootstrap/spec/arm/cortex_a9_mmu.cc
SRC_CC += bootstrap/spec/arm/cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc
SRC_CC += hw/spec/32bit/memory_map.cc

NR_OF_CPUS = 2

vpath bootstrap/board/zynq_qemu/platform.cc $(BASE_HW_DIR)/src/

include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc

CC_CXX_WARN_STRICT =
21 changes: 21 additions & 0 deletions lib/mk/spec/arm_v7/bootstrap-hw-zynq_zedboard.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
TMP := $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
BASE_HW_DIR := $(TMP:%lib/mk/bootstrap-hw.inc=%)

INC_DIR += $(REP_DIR)/src/bootstrap/board/zynq_zedboard

SRC_S += bootstrap/spec/arm/crt0.s

SRC_CC += bootstrap/board/zynq_qemu/platform.cc
SRC_CC += bootstrap/spec/arm/arm_v7_cpu.cc
SRC_CC += bootstrap/spec/arm/cortex_a9_mmu.cc
SRC_CC += bootstrap/spec/arm/cpu.cc
SRC_CC += bootstrap/spec/arm/gicv2.cc
SRC_CC += hw/spec/32bit/memory_map.cc

NR_OF_CPUS = 2

vpath bootstrap/board/zynq_qemu/platform.cc $(BASE_HW_DIR)/src/

include $(BASE_HW_DIR)/lib/mk/bootstrap-hw.inc

CC_CXX_WARN_STRICT =
2 changes: 1 addition & 1 deletion lib/mk/spec/arm_v7/core-hw-arndale.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

# add include paths
INC_DIR += $(REP_DIR)/src/core/spec/arndale
INC_DIR += $(REP_DIR)/src/core/board/arndale
INC_DIR += $(REP_DIR)/src/core/spec/arm/virtualization
INC_DIR += $(REP_DIR)/src/include

Expand Down
1 change: 0 additions & 1 deletion lib/mk/spec/arm_v7/core-hw-exynos5.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ BASE_HW_DIR := $(TMP:%lib/mk/core-hw.inc=%)

# add include paths
INC_DIR += $(REP_DIR)/src/core
INC_DIR += $(BASE_HW_DIR)/src/core/spec/exynos5

# add C++ sources
SRC_CC += spec/arm/exynos_mct.cc
Expand Down
2 changes: 1 addition & 1 deletion lib/mk/spec/arm_v7/core-hw-odroid_xu.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

# add include paths
INC_DIR += $(REP_DIR)/src/core/spec/odroid_xu
INC_DIR += $(REP_DIR)/src/core/board/odroid_xu
INC_DIR += $(REP_DIR)/src/include

# add C++ sources
Expand Down
2 changes: 1 addition & 1 deletion lib/mk/spec/arm_v7/core-hw-panda.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

# add include paths
INC_DIR += $(REP_DIR)/src/core/spec/panda
INC_DIR += $(REP_DIR)/src/core/board/panda
INC_DIR += $(REP_DIR)/src/include

# add C++ sources
Expand Down
18 changes: 18 additions & 0 deletions lib/mk/spec/arm_v7/core-hw-zynq_parallella.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# \brief Build config for Genodes core process
# \author Johannes Schlatow
# \date 2016-05-03
#

TMP := $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw-zynq.inc)
BASE_HW_DIR := $(TMP:%lib/mk/spec/arm_v7/core-hw-zynq.inc=%)

# add include paths
INC_DIR += $(REP_DIR)/src/core/board/zynq_parallella

NR_OF_CPUS = 2

# include less specific configuration
include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw-zynq.inc

CC_CXX_WARN_STRICT =
18 changes: 18 additions & 0 deletions lib/mk/spec/arm_v7/core-hw-zynq_zc702.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# \brief Build config for Genodes core process
# \author Johannes Schlatow
# \date 2016-05-03
#

TMP := $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw-zynq.inc)
BASE_HW_DIR := $(TMP:%lib/mk/spec/arm_v7/core-hw-zynq.inc=%)

# add include paths
INC_DIR += $(REP_DIR)/src/core/board/zynq_zc702

NR_OF_CPUS = 2

# include less specific configuration
include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw-zynq.inc

CC_CXX_WARN_STRICT =
18 changes: 18 additions & 0 deletions lib/mk/spec/arm_v7/core-hw-zynq_zc706.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# \brief Build config for Genodes core process
# \author Johannes Schlatow
# \date 2016-05-03
#

TMP := $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw-zynq.inc)
BASE_HW_DIR := $(TMP:%lib/mk/spec/arm_v7/core-hw-zynq.inc=%)

# add include paths
INC_DIR += $(REP_DIR)/src/core/board/zynq_zc706

NR_OF_CPUS = 2

# include less specific configuration
include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw-zynq.inc

CC_CXX_WARN_STRICT =
18 changes: 18 additions & 0 deletions lib/mk/spec/arm_v7/core-hw-zynq_zedboard.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# \brief Build config for Genodes core process
# \author Johannes Schlatow
# \date 2016-05-03
#

TMP := $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw-zynq.inc)
BASE_HW_DIR := $(TMP:%lib/mk/spec/arm_v7/core-hw-zynq.inc=%)

# add include paths
INC_DIR += $(REP_DIR)/src/core/board/zynq_zedboard

NR_OF_CPUS = 2

# include less specific configuration
include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw-zynq.inc

CC_CXX_WARN_STRICT =
21 changes: 0 additions & 21 deletions lib/mk/spec/zynq_parallella/bootstrap-hw.mk
View file

This file was deleted.

18 changes: 0 additions & 18 deletions lib/mk/spec/zynq_parallella/core-hw.mk
View file

This file was deleted.

21 changes: 0 additions & 21 deletions lib/mk/spec/zynq_zc702/bootstrap-hw.mk
View file

This file was deleted.

18 changes: 0 additions & 18 deletions lib/mk/spec/zynq_zc702/core-hw.mk
View file

This file was deleted.

21 changes: 0 additions & 21 deletions lib/mk/spec/zynq_zc706/bootstrap-hw.mk
View file

This file was deleted.

18 changes: 0 additions & 18 deletions lib/mk/spec/zynq_zc706/core-hw.mk
View file

This file was deleted.

Loading

2 comments on commit ce88df8

@skalk
Copy link
Owner Author

@skalk skalk commented on ce88df8 Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nfeske this commit ce88df8 re-enables the additional board declarations in genode-world after the recent changes, and removes the SPEC variables of this repository that were dropped.

@nfeske
Copy link

@nfeske nfeske commented on ce88df8 Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot, @skalk! Merged to master.

Please sign in to comment.