Samsung/Arndale: Removed compiler errors for latest GCC toolchain.

Signed-off-by: Shivamurthy Shastri <shiva.murthy@samsung.com>
Signed-off-by: Leif Lindholm <leif.lindholm@arm.com>
Signed-off-by: Rony Nandy <rony.nandy@linaro.org>

8 files changed, 14 insertions, 18 deletions

diff --git a/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.dsc b/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.dsc
index 6adb2ce87..243304538 100755
--- a/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.dsc
+++ b/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.dsc
@@ -274,7 +274,7 @@
   #EmbeddedPkg/SerialDxe/SerialDxe.inf
 
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+  #MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 
   SamsungPlatformPkg/ArndaleBoardPkg/FvbDxe/FvbDxe.inf
   SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/TimerDxe/TimerDxe.inf
@@ -345,7 +345,7 @@
   SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/PciEmulation/PciEmulation.inf
   #SamsungPlatformPkg/ExynosPkg/Exynos5250/OhciDxe/OhciDxe.inf
   MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
+  #MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
diff --git a/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.fdf b/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.fdf
index 1040cc0d9..51eee1b06 100755
--- a/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.fdf
+++ b/SamsungPlatformPkg/ArndaleBoardPkg/arndale-Exynos5250.fdf
@@ -173,7 +173,7 @@ READ_LOCK_STATUS   = TRUE
   #INF EmbeddedPkg/SerialDxe/SerialDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+  #INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 
 !ifdef $(EXYNOS5250_EVT1)
   INF SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/Gic400Dxe/PL390GicDxe.inf
@@ -214,7 +214,7 @@ READ_LOCK_STATUS   = TRUE
   INF SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/PciEmulation/PciEmulation.inf
   #INF SamsungPlatformPkg/ExynosPkg/Exynos5250/OhciDxe/OhciDxe.inf
   INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
+  #INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
diff --git a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe.c b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe.c
index 50e04279a..70dbae15d 100755
--- a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe.c
+++ b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe.c
@@ -654,8 +654,6 @@ TransferBlock (
   UINTN      Cmd = 0;
   UINTN      CmdInterruptEnable = 0;
   UINTN      CmdArgument = 0;
-  UINT32     SdMmcBaseAddr;
-  SdMmcBaseAddr = PcdGet32(PcdSdMmcBase);
 
   // 1. FIFO reset
   // MSHC_SendCmd do the fifo reset
@@ -757,13 +755,13 @@ DetectCard (
   )
 {
   EFI_STATUS    Status;
-  UINT32     SdMmcBaseAddr;
+  //UINT32     SdMmcBaseAddr;
 
   //DEBUG ((EFI_D_INFO, "===================================\n"));
   DEBUG ((EFI_D_INFO, "===SDHC: Version %a ===\n", DateInformation));
   //DEBUG ((EFI_D_INFO, "===================================\n"));
 
-  SdMmcBaseAddr = PcdGet32(PcdSdMmcBase);
+  //SdMmcBaseAddr = PcdGet32(PcdSdMmcBase);
 
   if (!CardPresent ()) {
     return EFI_NO_MEDIA;
diff --git a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe_5250.c b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe_5250.c
index 8b7eeb2c3..5408360b0 100755
--- a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe_5250.c
+++ b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/SDHCDxe_EVT1/SDHCDxe_5250.c
@@ -161,7 +161,7 @@ InitializeMSHC (
   EFI_STATUS    Status;
   EXYNOS_GPIO *Gpio;
   UINT32 CumBaseAddr;
-  UINT32 SdMmcBaseAddr;
+  //UINT32 SdMmcBaseAddr;
   UINT32 i, clock;
   volatile UINT32 ctl_val;
 
@@ -170,7 +170,7 @@ InitializeMSHC (
   ASSERT_EFI_ERROR(Status);
 
   CumBaseAddr = PcdGet32(PcdCmuBase);
-  SdMmcBaseAddr = PcdGet32(PcdSdMmcBase);
+  //SdMmcBaseAddr = PcdGet32(PcdSdMmcBase);
 
   //MmioWrite32((SdMmcBaseAddr + SDHC_SWRST_OFFSET), SRA); 
 
diff --git a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe.c b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe.c
index 9d5a80a9f..c38001a5c 100755
--- a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe.c
+++ b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe.c
@@ -699,8 +699,6 @@ TransferBlock (
   UINTN      Cmd = 0;
   UINTN      CmdInterruptEnable = 0;
   UINTN      CmdArgument = 0;
-  UINT32     SdMmcBaseAddr;
-  SdMmcBaseAddr = PcdGet32(PcdSdMmcCH0Base);
 
   // 1. FIFO reset
   // MSHC_SendCmd do the fifo reset
@@ -786,13 +784,13 @@ DetectCard (
   )
 {
   EFI_STATUS    Status;
-  UINT32     SdMmcBaseAddr;
+  //UINT32     SdMmcBaseAddr;
 
   //DEBUG ((EFI_D_INFO, "===================================\n"));
   DEBUG ((EFI_D_INFO, "===MSHC: Version %a ===\n", DateInformation));
   //DEBUG ((EFI_D_INFO, "===================================\n"));
 
-  SdMmcBaseAddr = PcdGet32(PcdSdMmcCH0Base);
+  //SdMmcBaseAddr = PcdGet32(PcdSdMmcCH0Base);
 
   if (!CardPresent ()) {
     return EFI_NO_MEDIA;
diff --git a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe_5250.c b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe_5250.c
index 676e330f0..511b079d4 100755
--- a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe_5250.c
+++ b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Drivers/eMMCDxe/eMMCDxe_5250.c
@@ -164,7 +164,7 @@ InitializeMSHC (
   EFI_STATUS    Status;
   EXYNOS_GPIO *Gpio;
   UINT32 CumBaseAddr;
-  UINT32 SdMmcBaseAddr;
+  //UINT32 SdMmcBaseAddr;
   UINT32 i, clock;
   volatile UINT32 ctl_val;
 
@@ -173,7 +173,7 @@ InitializeMSHC (
   ASSERT_EFI_ERROR(Status);
 
   CumBaseAddr = PcdGet32(PcdCmuBase);
-  SdMmcBaseAddr = PcdGet32(PcdSdMmcCH0Base);
+  //SdMmcBaseAddr = PcdGet32(PcdSdMmcCH0Base);
 
   //MmioWrite32((SdMmcBaseAddr + SDHC_SWRST_OFFSET), SRA); 
 
diff --git a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Library/RealTimeClockLib/RealTimeClockLib.c b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Library/RealTimeClockLib/RealTimeClockLib.c
index 7b83f0878..2325a31b0 100644
--- a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Library/RealTimeClockLib/RealTimeClockLib.c
+++ b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Library/RealTimeClockLib/RealTimeClockLib.c
@@ -286,7 +286,6 @@ LibRtcInitialize (
   IN EFI_SYSTEM_TABLE                      *SystemTable
   )
 {
-  EFI_STATUS    Status;
   EFI_HANDLE    Handle;
   EFI_TIME      Time;
 
@@ -325,7 +324,7 @@ LibRtcInitialize (
 
   // Install the protocol
   Handle = NULL;
-  Status = gBS->InstallMultipleProtocolInterfaces (
+  gBS->InstallMultipleProtocolInterfaces (
                  &Handle,
                  &gEfiRealTimeClockArchProtocolGuid,  NULL,
                  NULL
diff --git a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Sec/Smc.c b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Sec/Smc.c
index 1177139c5..3de899a11 100644
--- a/SamsungPlatformPkg/ExynosPkg/Exynos5250/Sec/Smc.c
+++ b/SamsungPlatformPkg/ExynosPkg/Exynos5250/Sec/Smc.c
@@ -62,6 +62,7 @@ UINT32 exynos_smc(UINT32 cmd, UINT32 arg1, UINT32 arg2, UINT32 arg3)
 	register UINT32 reg3 __asm__("r3") = arg3;
 
 	__asm__ volatile (
+		".arch_extension sec\n"
 		"smc	0\n"
 		: "+r"(reg0), "+r"(reg1), "+r"(reg2), "+r"(reg3)