Cleanup as DD1 is not supported anymore

Change-Id: I57580a088ffc62cc678b32d8d0779d992df6d76a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52763
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

6 files changed, 6 insertions, 25 deletions

diff --git a/src/build/import_hwp_mk/power/istep2/Makefile b/src/build/import_hwp_mk/power/istep2/Makefile
index 76d811d7..e42e2119 100644
--- a/src/build/import_hwp_mk/power/istep2/Makefile
+++ b/src/build/import_hwp_mk/power/istep2/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istep2files.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEP2 := $(addprefix $(OBJDIR-ISTEP2)/, $(ISTEP2_OBJECTS))
 
 .PHONY: clean istep2
diff --git a/src/build/import_hwp_mk/power/istep3/Makefile b/src/build/import_hwp_mk/power/istep3/Makefile
index f1f90eaa..c71016c5 100644
--- a/src/build/import_hwp_mk/power/istep3/Makefile
+++ b/src/build/import_hwp_mk/power/istep3/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istep3files.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEP3 := $(addprefix $(OBJDIR-ISTEP3)/, $(ISTEP3_OBJECTS))
 
 .PHONY: clean istep3
diff --git a/src/build/import_hwp_mk/power/istep4/Makefile b/src/build/import_hwp_mk/power/istep4/Makefile
index 80ea200f..72cc7436 100644
--- a/src/build/import_hwp_mk/power/istep4/Makefile
+++ b/src/build/import_hwp_mk/power/istep4/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istep4files.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR):$(HWPLIB_SRCDIR):$(HWPFFDC_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEP4 := $(addprefix $(OBJDIR-ISTEP4)/, $(ISTEP4_OBJECTS))
 
 .PHONY: clean istep4
diff --git a/src/build/import_hwp_mk/power/istep4/istep4files.mk b/src/build/import_hwp_mk/power/istep4/istep4files.mk
index 273950db..6b4efe27 100644
--- a/src/build/import_hwp_mk/power/istep4/istep4files.mk
+++ b/src/build/import_hwp_mk/power/istep4/istep4files.mk
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,12 +61,10 @@ ISTEP4-CPP-SOURCES +=p9_ncu_scom.C
 ISTEP4-CPP-SOURCES +=p9_l2_scom.C
 ISTEP4-CPP-SOURCES +=p9_l3_scom.C
 ISTEP4-CPP-SOURCES +=p9_common_poweronoff.C
-ifeq  ($(ddlevel), DD2)
 ISTEP4-CPP-SOURCES +=p9_eq_clear_atomic_lock.C
 ISTEP4-CPP-SOURCES +=p9_collect_deadman_ffdc.C
 ISTEP4-CPP-SOURCES +=p9_sbe_ppe_ffdc.C
 ISTEP4-CPP-SOURCES +=p9_sbe_ppe_utils.C
-endif
 ISTEP4-CPP-SOURCES +=p9_sbe_check_master_stop15.C
 ISTEP4-C-SOURCES =
 ISTEP4-S-SOURCES =
diff --git a/src/build/import_hwp_mk/power/istepmpipl/Makefile b/src/build/import_hwp_mk/power/istepmpipl/Makefile
index e559e3d8..f9cba2db 100644
--- a/src/build/import_hwp_mk/power/istepmpipl/Makefile
+++ b/src/build/import_hwp_mk/power/istepmpipl/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istepmpiplfiles.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(HWPLIB_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEPMPIPL := $(addprefix $(OBJDIR-ISTEPMPIPL)/, $(ISTEPMPIPL_OBJECTS))
 
 .PHONY: clean istepmpipl
diff --git a/src/build/utils/sbe_link.H b/src/build/utils/sbe_link.H
index c2c9623b..876b4b18 100644
--- a/src/build/utils/sbe_link.H
+++ b/src/build/utils/sbe_link.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -64,14 +64,8 @@
 #define SBE_XIP_TOC_OFFSET 8*8
 
 /// The link address of the P9 SBE Base image
-#define SBE_SEEPROM_BASE_ORIGIN 0x80000000
-#define OTPROM_SEEPROM_HIGHER_NIBBLE 0x8000
-#ifdef DD2
-#undef SBE_SEEPROM_BASE_ORIGIN
 #define SBE_SEEPROM_BASE_ORIGIN 0xFF800000
-#undef OTPROM_SEEPROM_HIGHER_NIBBLE
 #define OTPROM_SEEPROM_HIGHER_NIBBLE 0xFF80
-#endif
 
 ///  This Index depends upon XIP HEADER File
 ///  Each section table entry is 12 bytes(SIZE_OF_SBE_XIP_SECTION) size,