12 files changed, 0 insertions, 677 deletions
diff --git a/src/import/chips/p9/procedures/hwp/cache/Makefile b/src/import/chips/p9/procedures/hwp/cache/Makefile
deleted file mode 100644
index 475de65e..00000000
--- a/src/import/chips/p9/procedures/hwp/cache/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/cache/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-
-# This Makefile compiles all of the cache hardware procedure code. See the
-# "cachehcdfiles.mk" file in this directory.
-
-#all generated files from this makefile will end up in obj/cache
-export SUB_OBJDIR = /cache
-
-include img_defs.mk
-include cachehcdfiles.mk
-
-GCC-CFLAGS += -mlongcall
-
-OBJS := $(addprefix $(OBJDIR)/, $(CACHE_OBJECTS))
-
-libcache.a: cache
-	$(AR) crs $(OBJDIR)/libcache.a $(OBJDIR)/*.o
-
-.PHONY: clean cache
-cache: $(OBJS)
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-clean:
-	rm -fr $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
diff --git a/src/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk b/src/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk
deleted file mode 100644
index 3523c09c..00000000
--- a/src/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-#  @file cachehcdfiles.mk
-#
-#  @brief mk for including cache hcode object files
-#
-##########################################################################
-# Object Files
-##########################################################################
-
-CACHE-CPP-SOURCES += p9_hcd_cache_arrayinit.C
-CACHE-CPP-SOURCES += p9_hcd_cache_chiplet_init.C
-CACHE-CPP-SOURCES += p9_hcd_cache_chiplet_reset.C
-CACHE-CPP-SOURCES += p9_hcd_cache_dpll_setup.C
-CACHE-CPP-SOURCES += p9_hcd_cache_gptr_time_initf.C
-CACHE-CPP-SOURCES += p9_hcd_cache_initf.C
-CACHE-CPP-SOURCES += p9_hcd_cache_occ_runtime_scom.C
-CACHE-CPP-SOURCES += p9_hcd_cache_poweron.C
-CACHE-CPP-SOURCES += p9_hcd_cache_ras_runtime_scom.C
-CACHE-CPP-SOURCES += p9_hcd_cache_repair_initf.C
-CACHE-CPP-SOURCES += p9_hcd_cache_runinit.C
-CACHE-CPP-SOURCES += p9_hcd_cache_scomcust.C
-CACHE-CPP-SOURCES += p9_hcd_cache_scominit.C
-CACHE-CPP-SOURCES += p9_hcd_cache_startclocks.C
-CACHE-CPP-SOURCES += p9_hcd_cache_chiplet_l3_dcc_setup.C
-CACHE-CPP-SOURCES += p9_hcd_cache_dpll_initf.C
-CACHE-CPP-SOURCES += p9_hcd_cache_stopclocks.C
-CACHE-CPP-SOURCES += p9_hcd_l2_stopclocks.C
-
-CACHE-C-SOURCES   +=
-CACHE-S-SOURCES   +=
-
-CACHE_OBJECTS     += $(CACHE-CPP-SOURCES:.C=.o)
-CACHE_OBJECTS     += $(CACHE-C-SOURCES:.c=.o)
-CACHE_OBJECTS     += $(CACHE-S-SOURCES:.S=.o)
-
diff --git a/src/import/chips/p9/procedures/hwp/core/Makefile b/src/import/chips/p9/procedures/hwp/core/Makefile
deleted file mode 100644
index 0ef85918..00000000
--- a/src/import/chips/p9/procedures/hwp/core/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/core/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-
-# This Makefile compiles all of the core hardware procedure code. See the
-# "corehcdfiles.mk" file in this directory.
-
-#all generated files from this makefile will end up in obj/cache
-export SUB_OBJDIR = /core
-
-GCC-CFLAGS += -mlongcall
-include img_defs.mk
-include corehcdfiles.mk
-
-
-OBJS := $(addprefix $(OBJDIR)/, $(CORE_OBJECTS))
-
-libcore.a: core
-	$(AR) crs $(OBJDIR)/libcore.a $(OBJDIR)/*.o
-
-.PHONY: clean core
-core: $(OBJS)
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-clean:
-	rm -fr $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
diff --git a/src/import/chips/p9/procedures/hwp/core/corehcdfiles.mk b/src/import/chips/p9/procedures/hwp/core/corehcdfiles.mk
deleted file mode 100644
index 3c3cbcc8..00000000
--- a/src/import/chips/p9/procedures/hwp/core/corehcdfiles.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/core/corehcdfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-#  @file corehcdfiles.mk
-#
-#  @brief mk for including core hcode object files
-#
-##########################################################################
-# Object Files
-##########################################################################
-
-CORE-CPP-SOURCES += p9_hcd_core_arrayinit.C
-CORE-CPP-SOURCES += p9_hcd_core_chiplet_init.C
-CORE-CPP-SOURCES += p9_hcd_core_chiplet_reset.C
-CORE-CPP-SOURCES += p9_hcd_core_gptr_time_initf.C
-CORE-CPP-SOURCES += p9_hcd_core_initf.C
-CORE-CPP-SOURCES += p9_hcd_core_occ_runtime_scom.C
-CORE-CPP-SOURCES += p9_hcd_core_pcb_arb.C
-CORE-CPP-SOURCES += p9_hcd_core_poweron.C
-CORE-CPP-SOURCES += p9_hcd_core_ras_runtime_scom.C
-CORE-CPP-SOURCES += p9_hcd_core_repair_initf.C
-CORE-CPP-SOURCES += p9_hcd_core_runinit.C
-CORE-CPP-SOURCES += p9_hcd_core_scomcust.C
-CORE-CPP-SOURCES += p9_hcd_core_scominit.C
-CORE-CPP-SOURCES += p9_hcd_core_startclocks.C
-# TODO via RTC 152424
-# thread control procedure is in core directory, but this procedure needs to be
-# in PIBMEM for quiesce case, So compiling in nest makefile
-#CORE-CPP-SOURCES += p9_thread_control.C
-#CORE-CPP-SOURCES += p9_sbe_instruct_start.C
-CORE-CPP-SOURCES += p9_hcd_core_stopclocks.C
-
-CORE-C-SOURCES   +=
-CORE-S-SOURCES   +=
-
-CORE_OBJECTS     += $(CORE-CPP-SOURCES:.C=.o)
-CORE_OBJECTS     += $(CORE-C-SOURCES:.c=.o)
-CORE_OBJECTS     += $(CORE-S-SOURCES:.S=.o)
-
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/Makefile b/src/import/chips/p9/procedures/hwp/initfiles/Makefile
deleted file mode 100644
index 74b45b29..00000000
--- a/src/import/chips/p9/procedures/hwp/initfiles/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/initfiles/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-
-# This Makefile compiles all of the initfiles hardware procedure code. See the
-# "initfiles.mk" file in this directory.
-
-#all generated files from this makefile will end up in obj/initfiles
-export SUB_OBJDIR = /initfiles
-
-include img_defs.mk
-include initfiles.mk
-
-
-OBJS := $(addprefix $(OBJDIR)/, $(INITFILES_OBJECTS))
-
-libinitfiles.a: initfiles
-	$(AR) crs $(OBJDIR)/libinitfiles.a $(OBJDIR)/*.o
-
-.PHONY: clean initfiles
-initfiles: $(OBJS)
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-clean:
-	rm -fr $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/initfiles.mk b/src/import/chips/p9/procedures/hwp/initfiles/initfiles.mk
deleted file mode 100644
index 02806e6d..00000000
--- a/src/import/chips/p9/procedures/hwp/initfiles/initfiles.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/initfiles/initfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-#  @file initfiles.mk
-#
-#  @brief mk for including initfile object files
-#
-##########################################################################
-# Object Files
-##########################################################################
-
-INITFILES-CPP-SOURCES += p9_ncu_scom.C
-INITFILES-CPP-SOURCES += p9_l2_scom.C
-INITFILES-CPP-SOURCES += p9_l3_scom.C
-INITFILES-CPP-SOURCES += p9_core_scom.C
-INITFILES-CPP-SOURCES += p9_mmu_scom.C
-
-INITFILES-C-SOURCES   +=
-INITFILES-S-SOURCES   +=
-
-INITFILES_OBJECTS     += $(INITFILES-CPP-SOURCES:.C=.o)
-INITFILES_OBJECTS     += $(INITFILES-C-SOURCES:.c=.o)
-INITFILES_OBJECTS     += $(INITFILES-S-SOURCES:.S=.o)
-
diff --git a/src/import/chips/p9/procedures/hwp/nest/Makefile b/src/import/chips/p9/procedures/hwp/nest/Makefile
deleted file mode 100644
index d774f604..00000000
--- a/src/import/chips/p9/procedures/hwp/nest/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/nest/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-
-# This Makefile compiles all of the nest hardware procedure code. See the
-# "nestfiles.mk" file in this directory.
-
-#all generated files from this makefile will end up in obj/nest
-export SUB_OBJDIR = /nest
-
-include img_defs.mk
-include nestfiles.mk
-
-# TODO via RTC 152424
-# Adding VPATH as there are few procedures which are in
-# perv folder but we are compiling them here. Refer to
-# nestfiles.mk for details.
-export VPATH = $(PERV_SRCDIR):$(CORE_SRCDIR):$(NEST_SRCDIR)
-OBJS := $(addprefix $(OBJDIR)/, $(NEST_OBJECTS))
-
-libnest.a: nest
-	$(AR) crs $(OBJDIR)/libnest.a $(OBJDIR)/*.o
-
-.PHONY: clean nest
-nest: $(OBJS)
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-clean:
-	rm -fr $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
diff --git a/src/import/chips/p9/procedures/hwp/nest/nestfiles.mk b/src/import/chips/p9/procedures/hwp/nest/nestfiles.mk
deleted file mode 100644
index d9360a39..00000000
--- a/src/import/chips/p9/procedures/hwp/nest/nestfiles.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/nest/nestfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-#  @file nestfiles.mk
-#
-#  @brief mk for including nest object files
-#
-##########################################################################
-# Object Files
-##########################################################################
-
-NEST-CPP-SOURCES = p9_sbe_mcs_setup.C
-NEST-CPP-SOURCES +=p9_sbe_scominit.C
-NEST-CPP-SOURCES +=p9_sbe_fabricinit.C
-NEST-CPP-SOURCES +=p9_fbc_utils.C
-NEST-CPP-SOURCES +=p9_sbe_load_bootloader.C
-NEST-CPP-SOURCES +=p9_pba_access.C
-NEST-CPP-SOURCES +=p9_pba_coherent_utils.C
-NEST-CPP-SOURCES +=p9_pba_setup.C
-NEST-CPP-SOURCES +=p9_adu_access.C
-NEST-CPP-SOURCES +=p9_adu_setup.C
-NEST-CPP-SOURCES +=p9_adu_coherent_utils.C
-# TODO via RTC 152424
-# p9_ram_core.C will go to runtime makefile. Currently this procedure is in
-# perv directory. As we are putting perv procedures currently in SEEPROM.
-# So compiling p9_ram_core.C in nest makefile.
-NEST-CPP-SOURCES +=p9_ram_core.C
-# TODO via RTC 152424
-# swicth gear proecdures are in perv directory. But these procedures needs to
-# be executed from PIBMEM. So compiling these is nest makefile.
-NEST-CPP-SOURCES +=p9_sbe_gear_switcher.C
-NEST-CPP-SOURCES +=p9_sbe_tp_switch_gears.C
-# TODO via RTC 152424
-# thread control procedure is in core directory, but this procedure needs to be
-# in PIBMEM for quiesce case, So compiling in nest makefile
-NEST-CPP-SOURCES +=p9_thread_control.C
-NEST-CPP-SOURCES +=p9_sbe_instruct_start.C
-NEST-C-SOURCES =
-NEST-S-SOURCES =
-
-NEST_OBJECTS += $(NEST-CPP-SOURCES:.C=.o)
-NEST_OBJECTS += $(NEST-C-SOURCES:.c=.o)
-NEST_OBJECTS += $(NEST-S-SOURCES:.S=.o)
diff --git a/src/import/chips/p9/procedures/hwp/perv/Makefile b/src/import/chips/p9/procedures/hwp/perv/Makefile
deleted file mode 100644
index 800ff640..00000000
--- a/src/import/chips/p9/procedures/hwp/perv/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/perv/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-
-# This Makefile compiles all of the core hardware procedure code. See the
-# "pervfiles.mk" file in this directory.
-
-#all generated files from this makefile will end up in obj/perv
-export SUB_OBJDIR = /perv
-
-include img_defs.mk
-include pervfiles.mk
-
-GCC-CFLAGS += -mlongcall
-
-OBJS := $(addprefix $(OBJDIR)/, $(PERV_OBJECTS))
-
-libperv.a: perv
-	$(AR) crs $(OBJDIR)/libperv.a $(OBJDIR)/*.o
-
-.PHONY: clean perv
-perv: $(OBJS)
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-clean:
-	rm -fr $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
diff --git a/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk b/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk
deleted file mode 100644
index 050d0f13..00000000
--- a/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/perv/pervfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-#  @file pervfiles.mk
-#
-#  @brief mk for including perv object files
-#
-##########################################################################
-# Object Files
-##########################################################################
-
-PERV-CPP-SOURCES =p9_sbe_arrayinit.C
-PERV-CPP-SOURCES +=p9_sbe_attr_setup.C
-PERV-CPP-SOURCES +=p9_sbe_check_master.C
-PERV-CPP-SOURCES +=p9_sbe_chiplet_init.C
-PERV-CPP-SOURCES +=p9_sbe_chiplet_pll_initf.C
-PERV-CPP-SOURCES +=p9_sbe_chiplet_pll_setup.C
-PERV-CPP-SOURCES +=p9_sbe_chiplet_reset.C
-PERV-CPP-SOURCES +=p9_sbe_enable_seeprom.C
-PERV-CPP-SOURCES +=p9_sbe_lpc_init.C
-PERV-CPP-SOURCES +=p9_sbe_nest_enable_ridi.C
-PERV-CPP-SOURCES +=p9_sbe_nest_initf.C
-PERV-CPP-SOURCES +=p9_sbe_nest_startclocks.C
-PERV-CPP-SOURCES +=p9_sbe_npll_initf.C
-PERV-CPP-SOURCES +=p9_sbe_npll_setup.C
-PERV-CPP-SOURCES +=p9_sbe_select_ex.C
-PERV-CPP-SOURCES +=p9_sbe_startclock_chiplets.C
-PERV-CPP-SOURCES +=p9_sbe_tp_arrayinit.C
-PERV-CPP-SOURCES +=p9_sbe_tp_chiplet_init1.C
-PERV-CPP-SOURCES +=p9_sbe_tp_chiplet_init2.C
-PERV-CPP-SOURCES +=p9_sbe_tp_chiplet_init3.C
-PERV-CPP-SOURCES +=p9_sbe_tp_chiplet_reset.C
-PERV-CPP-SOURCES +=p9_sbe_tp_enable_ridi.C
-PERV-CPP-SOURCES +=p9_sbe_tp_initf.C
-PERV-CPP-SOURCES +=p9_sbe_tp_ld_image.C
-PERV-CPP-SOURCES +=p9_sbe_setup_evid.C
-PERV-CPP-SOURCES +=p9_perv_sbe_cmn.C
-PERV-CPP-SOURCES +=p9_sbe_common.C
-PERV-CPP-SOURCES +=p9_sbe_check_master_stop15.C
-PERV-CPP-SOURCES +=p9_hcd_cache_dcc_skewadjust_setup.C
-PERV-CPP-SOURCES +=p9_sbe_setup_boot_freq.C
-PERV-CPP-SOURCES +=p9_sbe_io_initf.C
-PERV-CPP-SOURCES +=p9_sbe_gptr_time_initf.C
-PERV-CPP-SOURCES +=p9_sbe_repr_initf.C
-PERV-CPP-SOURCES +=p9_sbe_tp_gptr_time_initf.C
-PERV-CPP-SOURCES +=p9_sbe_tp_repr_initf.C
-PERV-CPP-SOURCES +=p9_sbe_clock_test2.C
-
-PERV-C-SOURCES =
-PERV-S-SOURCES =
-
-PERV_OBJECTS += $(PERV-CPP-SOURCES:.C=.o)
-PERV_OBJECTS += $(PERV-C-SOURCES:.c=.o)
-PERV_OBJECTS += $(PERV-S-SOURCES:.S=.o)
diff --git a/src/import/chips/p9/procedures/hwp/pm/Makefile b/src/import/chips/p9/procedures/hwp/pm/Makefile
deleted file mode 100644
index f8c3cdd8..00000000
--- a/src/import/chips/p9/procedures/hwp/pm/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/pm/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-
-# This Makefile compiles all of the pm hardware procedure code. See the
-# "pmfiles.mk" file in this directory.
-
-#all generated files from this makefile will end up in obj/pm
-export SUB_OBJDIR = /pm
-
-include img_defs.mk
-include pmfiles.mk
-
-
-OBJS := $(addprefix $(OBJDIR)/, $(PM_OBJECTS))
-
-libpm.a: pm
-	$(AR) crs $(OBJDIR)/libpm.a $(OBJDIR)/*.o
-
-.PHONY: clean pm
-pm: $(OBJS)
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-clean:
-	rm -fr $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
diff --git a/src/import/chips/p9/procedures/hwp/pm/pmfiles.mk b/src/import/chips/p9/procedures/hwp/pm/pmfiles.mk
deleted file mode 100644
index 2c29c90b..00000000
--- a/src/import/chips/p9/procedures/hwp/pm/pmfiles.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/import/chips/p9/procedures/hwp/pm/pmfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-#  @file pmfiles.mk
-#
-#  @brief mk for including pm object files
-#
-##########################################################################
-# Object Files
-##########################################################################
-
-PM-CPP-SOURCES +=p9_pm_ocb_indir_access.C
-PM-CPP-SOURCES +=p9_pm_ocb_indir_setup_circular.C
-PM-CPP-SOURCES +=p9_pm_ocb_indir_setup_linear.C
-PM-CPP-SOURCES +=p9_pm_ocb_init.C
-PM-CPP-SOURCES +=p9_pm_utils.C
-PM-CPP-SOURCES +=p9_block_wakeup_intr.C
-PM-C-SOURCES =
-PM-S-SOURCES =
-
-PM_OBJECTS += $(PM-CPP-SOURCES:.C=.o)
-PM_OBJECTS += $(PM-C-SOURCES:.c=.o)
-PM_OBJECTS += $(PM-S-SOURCES:.S=.o)