aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2017-01-04 23:55:42 -0500
committerJoel Stanley <joel@jms.id.au>2017-01-10 07:01:35 -0500
commit0e81eb77f5f81be9a3fd4a080eba9abfb6e54a3a (patch)
tree5c1bc9e2139554745337d011496e0d5a7bc2be89
parent7ce7d89f48834cefece7804d38fc5d85382edf77 (diff)
ARM: configs: Update Aspeed with new drivers
We have upstream support for ftgmac100 ethernet with NCSI, GPIO, pinmux, and IPMI BT. Enable these for both g4 and g5 platforms. Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat
-rw-r--r--arch/arm/configs/aspeed_g4_defconfig38
-rw-r--r--arch/arm/configs/aspeed_g5_defconfig38
2 files changed, 71 insertions, 5 deletions
diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig
index ca39c04fec6b..2ea82272c2cb 100644
--- a/arch/arm/configs/aspeed_g4_defconfig
+++ b/arch/arm/configs/aspeed_g4_defconfig
@@ -29,22 +29,49 @@ CONFIG_DEBUG_RODATA=y
29CONFIG_AEABI=y 29CONFIG_AEABI=y
30CONFIG_UACCESS_WITH_MEMCPY=y 30CONFIG_UACCESS_WITH_MEMCPY=y
31CONFIG_SECCOMP=y 31CONFIG_SECCOMP=y
32# CONFIG_ATAGS is not set
33CONFIG_ZBOOT_ROM_TEXT=0x0
34CONFIG_ZBOOT_ROM_BSS=0x0
35CONFIG_ARM_APPENDED_DTB=y 32CONFIG_ARM_APPENDED_DTB=y
36CONFIG_ARM_ATAG_DTB_COMPAT=y 33CONFIG_ARM_ATAG_DTB_COMPAT=y
37CONFIG_KEXEC=y 34CONFIG_KEXEC=y
38# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36CONFIG_NET=y
37CONFIG_INET=y
38CONFIG_NET_NCSI=y
39# CONFIG_WIRELESS is not set
39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40CONFIG_DEVTMPFS=y 41CONFIG_DEVTMPFS=y
41CONFIG_DEVTMPFS_MOUNT=y 42CONFIG_DEVTMPFS_MOUNT=y
42# CONFIG_PREVENT_FIRMWARE_BUILD is not set 43# CONFIG_PREVENT_FIRMWARE_BUILD is not set
44CONFIG_NETDEVICES=y
45# CONFIG_NET_VENDOR_ALACRITECH is not set
46# CONFIG_NET_VENDOR_AMAZON is not set
47# CONFIG_NET_VENDOR_ARC is not set
48# CONFIG_NET_CADENCE is not set
49# CONFIG_NET_VENDOR_BROADCOM is not set
50# CONFIG_NET_VENDOR_CIRRUS is not set
51# CONFIG_NET_VENDOR_EZCHIP is not set
52CONFIG_FTGMAC100=y
53# CONFIG_NET_VENDOR_HISILICON is not set
54# CONFIG_NET_VENDOR_INTEL is not set
55# CONFIG_NET_VENDOR_MARVELL is not set
56# CONFIG_NET_VENDOR_MICREL is not set
57# CONFIG_NET_VENDOR_NATSEMI is not set
58# CONFIG_NET_VENDOR_NETRONOME is not set
59# CONFIG_NET_VENDOR_QUALCOMM is not set
60# CONFIG_NET_VENDOR_RENESAS is not set
61# CONFIG_NET_VENDOR_ROCKER is not set
62# CONFIG_NET_VENDOR_SAMSUNG is not set
63# CONFIG_NET_VENDOR_SEEQ is not set
64# CONFIG_NET_VENDOR_SOLARFLARE is not set
65# CONFIG_NET_VENDOR_SMSC is not set
66# CONFIG_NET_VENDOR_STMICRO is not set
67# CONFIG_NET_VENDOR_SYNOPSYS is not set
68# CONFIG_NET_VENDOR_VIA is not set
69# CONFIG_NET_VENDOR_WIZNET is not set
70# CONFIG_WLAN is not set
43# CONFIG_INPUT is not set 71# CONFIG_INPUT is not set
44# CONFIG_SERIO is not set 72# CONFIG_SERIO is not set
45# CONFIG_VT is not set 73# CONFIG_VT is not set
46# CONFIG_LEGACY_PTYS is not set 74# CONFIG_LEGACY_PTYS is not set
47# CONFIG_DEVKMEM is not set
48CONFIG_SERIAL_8250=y 75CONFIG_SERIAL_8250=y
49# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set 76# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
50CONFIG_SERIAL_8250_CONSOLE=y 77CONFIG_SERIAL_8250_CONSOLE=y
@@ -53,7 +80,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6
53CONFIG_SERIAL_8250_EXTENDED=y 80CONFIG_SERIAL_8250_EXTENDED=y
54CONFIG_SERIAL_8250_SHARE_IRQ=y 81CONFIG_SERIAL_8250_SHARE_IRQ=y
55CONFIG_SERIAL_OF_PLATFORM=y 82CONFIG_SERIAL_OF_PLATFORM=y
83CONFIG_ASPEED_BT_IPMI_BMC=y
56# CONFIG_HW_RANDOM is not set 84# CONFIG_HW_RANDOM is not set
85CONFIG_GPIOLIB=y
86CONFIG_GPIO_ASPEED=y
57# CONFIG_USB_SUPPORT is not set 87# CONFIG_USB_SUPPORT is not set
58# CONFIG_IOMMU_SUPPORT is not set 88# CONFIG_IOMMU_SUPPORT is not set
59CONFIG_FIRMWARE_MEMMAP=y 89CONFIG_FIRMWARE_MEMMAP=y
diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig
index 4f366b0370e9..ae4295ec5c3e 100644
--- a/arch/arm/configs/aspeed_g5_defconfig
+++ b/arch/arm/configs/aspeed_g5_defconfig
@@ -27,6 +27,7 @@ CONFIG_ARCH_MULTI_V6=y
27CONFIG_ARCH_ASPEED=y 27CONFIG_ARCH_ASPEED=y
28CONFIG_MACH_ASPEED_G5=y 28CONFIG_MACH_ASPEED_G5=y
29CONFIG_DEBUG_RODATA=y 29CONFIG_DEBUG_RODATA=y
30CONFIG_VMSPLIT_2G=y
30CONFIG_AEABI=y 31CONFIG_AEABI=y
31CONFIG_UACCESS_WITH_MEMCPY=y 32CONFIG_UACCESS_WITH_MEMCPY=y
32CONFIG_SECCOMP=y 33CONFIG_SECCOMP=y
@@ -37,15 +38,46 @@ CONFIG_ARM_APPENDED_DTB=y
37CONFIG_ARM_ATAG_DTB_COMPAT=y 38CONFIG_ARM_ATAG_DTB_COMPAT=y
38CONFIG_KEXEC=y 39CONFIG_KEXEC=y
39# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 40# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
41CONFIG_NET=y
42CONFIG_UNIX=y
43CONFIG_INET=y
44CONFIG_NET_NCSI=y
45# CONFIG_WIRELESS is not set
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41CONFIG_DEVTMPFS=y 47CONFIG_DEVTMPFS=y
42CONFIG_DEVTMPFS_MOUNT=y 48CONFIG_DEVTMPFS_MOUNT=y
43# CONFIG_PREVENT_FIRMWARE_BUILD is not set 49# CONFIG_PREVENT_FIRMWARE_BUILD is not set
50CONFIG_NETDEVICES=y
51# CONFIG_NET_VENDOR_ALACRITECH is not set
52# CONFIG_NET_VENDOR_AMAZON is not set
53# CONFIG_NET_VENDOR_ARC is not set
54# CONFIG_NET_CADENCE is not set
55# CONFIG_NET_VENDOR_BROADCOM is not set
56# CONFIG_NET_VENDOR_CIRRUS is not set
57# CONFIG_NET_VENDOR_EZCHIP is not set
58CONFIG_FTGMAC100=y
59# CONFIG_NET_VENDOR_HISILICON is not set
60# CONFIG_NET_VENDOR_INTEL is not set
61# CONFIG_NET_VENDOR_MARVELL is not set
62# CONFIG_NET_VENDOR_MICREL is not set
63# CONFIG_NET_VENDOR_NATSEMI is not set
64# CONFIG_NET_VENDOR_NETRONOME is not set
65# CONFIG_NET_VENDOR_QUALCOMM is not set
66# CONFIG_NET_VENDOR_RENESAS is not set
67# CONFIG_NET_VENDOR_ROCKER is not set
68# CONFIG_NET_VENDOR_SAMSUNG is not set
69# CONFIG_NET_VENDOR_SEEQ is not set
70# CONFIG_NET_VENDOR_SOLARFLARE is not set
71# CONFIG_NET_VENDOR_SMSC is not set
72# CONFIG_NET_VENDOR_STMICRO is not set
73# CONFIG_NET_VENDOR_SYNOPSYS is not set
74# CONFIG_NET_VENDOR_VIA is not set
75# CONFIG_NET_VENDOR_WIZNET is not set
76# CONFIG_WLAN is not set
44# CONFIG_INPUT is not set 77# CONFIG_INPUT is not set
45# CONFIG_SERIO is not set 78# CONFIG_SERIO is not set
46# CONFIG_VT is not set 79# CONFIG_VT is not set
47# CONFIG_LEGACY_PTYS is not set 80# CONFIG_LEGACY_PTYS is not set
48# CONFIG_DEVKMEM is not set
49CONFIG_SERIAL_8250=y 81CONFIG_SERIAL_8250=y
50# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set 82# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
51CONFIG_SERIAL_8250_CONSOLE=y 83CONFIG_SERIAL_8250_CONSOLE=y
@@ -54,7 +86,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6
54CONFIG_SERIAL_8250_EXTENDED=y 86CONFIG_SERIAL_8250_EXTENDED=y
55CONFIG_SERIAL_8250_SHARE_IRQ=y 87CONFIG_SERIAL_8250_SHARE_IRQ=y
56CONFIG_SERIAL_OF_PLATFORM=y 88CONFIG_SERIAL_OF_PLATFORM=y
89CONFIG_ASPEED_BT_IPMI_BMC=y
57# CONFIG_HW_RANDOM is not set 90# CONFIG_HW_RANDOM is not set
91CONFIG_GPIOLIB=y
92CONFIG_GPIO_ASPEED=y
58# CONFIG_USB_SUPPORT is not set 93# CONFIG_USB_SUPPORT is not set
59# CONFIG_IOMMU_SUPPORT is not set 94# CONFIG_IOMMU_SUPPORT is not set
60CONFIG_FIRMWARE_MEMMAP=y 95CONFIG_FIRMWARE_MEMMAP=y
@@ -82,6 +117,7 @@ CONFIG_DEBUG_UART_PHYS=0x1e784000
82CONFIG_DEBUG_UART_VIRT=0xe8784000 117CONFIG_DEBUG_UART_VIRT=0xe8784000
83CONFIG_EARLY_PRINTK=y 118CONFIG_EARLY_PRINTK=y
84CONFIG_DEBUG_SET_MODULE_RONX=y 119CONFIG_DEBUG_SET_MODULE_RONX=y
120CONFIG_CRYPTO_ECHAINIV=y
85# CONFIG_XZ_DEC_X86 is not set 121# CONFIG_XZ_DEC_X86 is not set
86# CONFIG_XZ_DEC_POWERPC is not set 122# CONFIG_XZ_DEC_POWERPC is not set
87# CONFIG_XZ_DEC_IA64 is not set 123# CONFIG_XZ_DEC_IA64 is not set
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 19:11:44 -0400