diff --git a/mainboard/Kconfig b/mainboard/Kconfig
index 286b82790e..b43630b04a 100644
--- a/mainboard/Kconfig
+++ b/mainboard/Kconfig
@@ -2,7 +2,13 @@ menu "Mainboard"
 
 choice
 	prompt "Mainboard vendor"
-	default EMULATION
+	default VENDOR_EMULATION
+
+config VENDOR_AMD
+	bool "AMD"
+	help
+	  Select this option for various systems from 
+	  Advanced Micro Devices, Inc
 
 config VENDOR_EMULATION
 	bool "Emulated systems"
@@ -12,6 +18,7 @@ config VENDOR_EMULATION
 endchoice
 
 source "mainboard/emulation/Kconfig"
+source "mainboard/amd/Kconfig"
 
 choice
 	prompt "ROM chip size"
diff --git a/mainboard/amd/Kconfig b/mainboard/amd/Kconfig
new file mode 100644
index 0000000000..73976b97a8
--- /dev/null
+++ b/mainboard/amd/Kconfig
@@ -0,0 +1,18 @@
+choice
+	prompt "Mainboard model"
+	depends on VENDOR_AMD
+
+config BOARD_AMD_NORWICH
+	bool "AMD Norwich (LX Devel)"
+	select ARCH_X86
+	select CPU_AMD_GEODELX
+	select OPTION_TABLE
+	select NORTHBRIDGE_AMD_GEODELX
+	select SOUTHBRIDGE_AMD_CS5536
+	#select SUPERIO_WINBOND_W83627HF
+	help
+	  AMD Norwich Development board
+endchoice
+
+source "mainboard/amd/norwich/Kconfig"
+
diff --git a/mainboard/amd/norwich/Kconfig b/mainboard/amd/norwich/Kconfig
new file mode 100644
index 0000000000..7acc6955e5
--- /dev/null
+++ b/mainboard/amd/norwich/Kconfig
@@ -0,0 +1,21 @@
+config MAINBOARD_NAME
+	string
+	default amd/norwich
+	depends BOARD_AMD_NORWICH
+	help
+	  This is the default mainboard name.
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1022
+	depends BOARD_AMD_NORWICH
+	help
+	  Mainboard specific PCI subsystem vendor ID.
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x2323
+	depends BOARD_AMD_NORWICH
+	help
+	  Mainboard specific PCI subsystem device ID.
+