aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-11-21 11:34:11 -0500
committerKevin O'Connor <kevin@koconnor.net>2019-11-21 11:54:46 -0500
commitd8b6ff5c5e6846fd23381d99a8463adb0ee3099b (patch)
tree883bea61776f24672ac27f7a5dce4cce29cb7031
parentbab27651a1cda4897f307e9bd5198774f4efad45 (diff)
downloadkutter-d8b6ff5c5e6846fd23381d99a8463adb0ee3099b.tar.gz
kutter-d8b6ff5c5e6846fd23381d99a8463adb0ee3099b.tar.xz
kutter-d8b6ff5c5e6846fd23381d99a8463adb0ee3099b.zip
lpc176x: Minor rework of HAVE_CHIPID kconfig
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--src/Kconfig17
-rw-r--r--src/lpc176x/Kconfig5
2 files changed, 9 insertions, 13 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 36cb7c12..12dd6e2a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -50,10 +50,6 @@ config SERIAL_BAUD
Specify the baud rate of the serial port. This should be set
to 250000. Read the FAQ before changing this value.
-config HAVE_CHIPID
- bool
- default n
-
# Generic configuration options for USB
menu "USB ids"
depends on USBSERIAL
@@ -64,13 +60,13 @@ config USB_VENDOR_ID
config USB_DEVICE_ID
hex "USB device ID"
default 0xabcd
-config USB_SERIAL_NUMBER
- string "USB serial number" if !USB_SERIAL_NUMBER_CHIPID
- default "12345"
config USB_SERIAL_NUMBER_CHIPID
depends on HAVE_CHIPID
bool "USB serial number from CHIPID"
default y
+config USB_SERIAL_NUMBER
+ string "USB serial number" if !USB_SERIAL_NUMBER_CHIPID
+ default "12345"
endmenu
@@ -108,8 +104,8 @@ config INITIAL_PINS
pins will be set to output high - preface a pin with a '!'
character to set that pin to output low.
-# The HAVE_GPIO_x options allow boards to disable support for some
-# commands if the hardware does not support the feature.
+# The HAVE_x options allow boards to disable support for some commands
+# if the hardware does not support the feature.
config HAVE_GPIO
bool
default n
@@ -128,6 +124,9 @@ config HAVE_GPIO_HARD_PWM
config HAVE_GPIO_BITBANGING
bool
default n
+config HAVE_CHIPID
+ bool
+ default n
config INLINE_STEPPER_HACK
# Enables gcc to inline stepper_event() into the main timer irq handler
diff --git a/src/lpc176x/Kconfig b/src/lpc176x/Kconfig
index 052396e9..02188752 100644
--- a/src/lpc176x/Kconfig
+++ b/src/lpc176x/Kconfig
@@ -10,6 +10,7 @@ config LPC_SELECT
select HAVE_GPIO_I2C
select HAVE_GPIO_SPI
select HAVE_GPIO_BITBANGING
+ select HAVE_CHIPID
config BOARD_DIRECTORY
string
@@ -66,8 +67,4 @@ config SERIAL
bool
default y
-config HAVE_CHIPID
- bool
- default y
-
endif