diff --git a/board/Kconfig b/board/Kconfig
index 4592075..3605174 100644
--- a/board/Kconfig
+++ b/board/Kconfig
@@ -86,19 +86,19 @@ menu "Device Specific Addresses"
 	config PAYLOAD_ENTRY
 		hex "Payload Entry Address"
 		default 0x830000000 if APPLE_N61AP
-		default 0x090000000 if SAMSUNG_C1S
+		default 0x090000000 if EXYNOS_990
 		default 0x050000000 if SAMSUNG_NOBLELTE
 		default 0x090000000 if SAMSUNG_JACKPOTLTE
 		default 0x090000000 if SAMSUNG_ZEROFLTE
 		default 0x090000000 if SAMSUNG_DREAMLTE
 		default 0x090000000 if SAMSUNG_STARLTE
-		default 0x090000000 if SAMSUNG_X1S
 		default 0x050000000 if SAMSUNG_J4LTE
 		default 0x090000000 if SAMSUNG_J5LTE
 		default 0x090000000 if SAMSUNG_GTA4XL
 
 	config RAMDISK_ENTRY
 		hex "Ramdisk Entry Address"
+		default 0x082000000 if EXYNOS_990
 		default 0x082000000 if SAMSUNG_DREAMLTE
 		default 0x084000000 if SAMSUNG_C1S
 		default 0x084000000 if SAMSUNG_X1S
@@ -107,13 +107,12 @@ menu "Device Specific Addresses"
 		hex "Framebuffer Base Address (for SimpleFB)"
 		depends on SIMPLE_FB
 		default 0x83e900000 if APPLE_N61AP
-		default 0x0f1000000 if SAMSUNG_C1S
+		default 0x0f1000000 if EXYNOS_990
 		default 0x0e2a00000 if SAMSUNG_NOBLELTE
 		default 0x0ec000000 if SAMSUNG_JACKPOTLTE
 		default 0x0e2a00000 if SAMSUNG_ZEROFLTE
 		default 0x0cc000000 if SAMSUNG_DREAMLTE
 		default 0x0cc000000 if SAMSUNG_STARLTE
-		default 0x0f1000000 if SAMSUNG_X1S
 		default 0x067000000 if SAMSUNG_J4LTE
 		default 0x08e000000 if SAMSUNG_J5LTE
 		default 0x0ca000000 if SAMSUNG_GTA4XL
@@ -152,13 +151,12 @@ menu "Device Specific Addresses"
 		int "Framebuffer Stride (for SimpleFB)"
 		depends on SIMPLE_FB
 		default 4 if APPLE_N61AP
-		default 4 if SAMSUNG_C1S
+		default 4 if EXYNOS_990
 		default 4 if SAMSUNG_NOBLELTE
 		default 4 if SAMSUNG_JACKPOTLTE
 		default 4 if SAMSUNG_ZEROFLTE
 		default 4 if SAMSUNG_DREAMLTE
 		default 4 if SAMSUNG_STARLTE
-		default 4 if SAMSUNG_X1S
 		default 4 if SAMSUNG_J4LTE
 		default 3 if SAMSUNG_J5LTE
 		default 4 if SAMSUNG_GTA4XL
diff --git a/board/samsung/board-c1s.c b/board/samsung/board-c1s.c
index 7fbafb5..b9a1110 100755
--- a/board/samsung/board-c1s.c
+++ b/board/samsung/board-c1s.c
@@ -6,9 +6,7 @@
 #include <board.h>
 #include <drivers/framework.h>
 #include <lib/simplefb.h>
-
-#define DECON_F_BASE		0x19050000
-#define HW_SW_TRIG_CONTROL	0x70
+#include <soc/exynos990.h>
 
 void init_board_funcs(void *board)
 {
@@ -29,6 +27,7 @@ int board_init(void)
 {
 	/* Allow framebuffer to be written to */
 	*(int*) (DECON_F_BASE + HW_SW_TRIG_CONTROL) = 0x1281;
+
 	return 0;
 }
 
diff --git a/board/samsung/board-x1s.c b/board/samsung/board-x1s.c
index ecf09a8..ddd7c1d 100644
--- a/board/samsung/board-x1s.c
+++ b/board/samsung/board-x1s.c
@@ -6,9 +6,7 @@
 #include <board.h>
 #include <drivers/framework.h>
 #include <lib/simplefb.h>
-
-#define DECON_F_BASE		0x19050000
-#define HW_SW_TRIG_CONTROL	0x70
+#include <soc/exynos990.h>
 
 void init_board_funcs(void *board)
 {