s5j/gpio: remove CONFIG_S5J_GPIO

In S5J, GPIO driver is controlling pinmux configuration for other
peripherals. Without it, the entire system cannot work. Thus, having
GPIO or not actually configurable. It should be enabled always. On the
other hands, the lower-half GPIO driver can be excluded from the
compilation when the upper-half driver is disabled.

Change-Id: I81b3d196b4e9091f86f2d9006ee37c020c8df5b9
Signed-off-by: Heesub Shin <heesub.shin@samsung.com>

diff --git a/os/arch/arm/src/s5j/Kconfig b/os/arch/arm/src/s5j/Kconfig
index 90ae084..b7ff8b3 100644 (file)
--- a/os/arch/arm/src/s5j/Kconfig
+++ b/os/arch/arm/src/s5j/Kconfig
@@ -196,10 +196,6 @@ config S5J_MAILBOX
        default n
        select MAILBOX
 
-config S5J_GPIO
-       bool "S5J GPIO support"
-       default n
-
 config S5J_CHIPID
        bool "S5J CHIPID support"
        default n

diff --git a/os/arch/arm/src/s5j/Make.defs b/os/arch/arm/src/s5j/Make.defs
index 25cbd32..690dec4 100644 (file)
--- a/os/arch/arm/src/s5j/Make.defs
+++ b/os/arch/arm/src/s5j/Make.defs
@@ -122,8 +122,9 @@ CHIP_CSRCS += s5j_boot.c s5j_irq.c
 CHIP_CSRCS += s5j_serial.c
 CHIP_CSRCS += s5j_mac.c
 
-ifeq ($(CONFIG_S5J_GPIO),y)
-CHIP_CSRCS += s5j_gpio.c s5j_gpio_lowerhalf.c
+CHIP_CSRCS += s5j_gpio.c
+ifeq ($(CONFIG_GPIO),y)
+CHIP_CSRCS += s5j_gpio_lowerhalf.c
 endif
 
 ifeq ($(CONFIG_S5J_SPI),y)