From 46bc61999d4ac421cc5435dce3ceff5767dd27c3 Mon Sep 17 00:00:00 2001 From: Rajkumar Ayyasamy Date: Thu, 25 Jan 2018 15:05:44 +0530 Subject: [PATCH] ipq806x: make diagnostics feature configurable. This patch makes diagnostics feature configurable and in the standard config diagnostics feature is disabled Change-Id: Ib5478701075591369c14e1a4d1200d792e434df4 Signed-off-by: Rajkumar Ayyasamy --- board/ipq806x/Kconfig | 8 + configs/ipq806x_defconfig | 3 + configs/ipq806x_standard_defconfig | 301 +++++++++++++++++++++++++++++ include/configs/ipq806x.h | 3 - 4 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 configs/ipq806x_standard_defconfig diff --git a/board/ipq806x/Kconfig b/board/ipq806x/Kconfig index a18f54a8c2..a0618db816 100644 --- a/board/ipq806x/Kconfig +++ b/board/ipq806x/Kconfig @@ -11,5 +11,13 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "ipq806x" +config IPQ806X_I2C + bool "ipq806x i2c" + +config USB_XHCI_IPQ + bool "ipq806x usb" + +config PCI_IPQ + bool "ipq806x pci" endif diff --git a/configs/ipq806x_defconfig b/configs/ipq806x_defconfig index bf84302b20..57da183e52 100644 --- a/configs/ipq806x_defconfig +++ b/configs/ipq806x_defconfig @@ -173,6 +173,7 @@ CONFIG_SIMPLE_BUS=y # # I2C support # +CONFIG_IPQ806X_I2C=y # CONFIG_DM_I2C_COMPAT is not set # CONFIG_CROS_EC_KEYB is not set @@ -211,6 +212,7 @@ CONFIG_SIMPLE_BUS=y # # PCI # +CONFIG_PCI_IPQ=y # CONFIG_DM_PCI is not set # @@ -251,6 +253,7 @@ CONFIG_REQUIRE_SERIAL_CONSOLE=y # # USB support # +CONFIG_USB_XHCI_IPQ=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/ipq806x_standard_defconfig b/configs/ipq806x_standard_defconfig new file mode 100644 index 0000000000..b921d1c8a8 --- /dev/null +++ b/configs/ipq806x_standard_defconfig @@ -0,0 +1,301 @@ +CONFIG_ARM=y +CONFIG_HAS_VBAR=y +CONFIG_CPU_V7=y +CONFIG_ARCH_IPQ806x=y +CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_SYS_MALLOC_F=y +CONFIG_DM_SERIAL=y +CONFIG_DEFAULT_DEVICE_TREE="" +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EXPERT=y +CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +# CONFIG_FIT_SIGNATURE is not set +CONFIG_SYS_EXTRA_OPTIONS="" +CONFIG_SYS_PROMPT="IPQ806x# " +# CONFIG_CMD_ELF is not set + +# +# Commands +# + +# +# Info commands +# +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_CONSOLE is not set + +# +# Boot commands +# +# CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BOOTM=y +CONFIG_CMD_GO=y +# CONFIG_CMD_RUN is not set +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set + +# +# Environment commands +# +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_EDITENV is not set +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_ENV_EXISTS=y + +# +# Memory commands +# +CONFIG_CMD_CRC32=y +# CONFIG_LOOPW is not set +CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MX_CYCLIC is not set +# CONFIG_CMD_MEMINFO is not set + +# +# Device access commands +# +# CONFIG_CMD_DM is not set +# CONFIG_CMD_DEMO is not set +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_NAND is not set +# CONFIG_CMD_SF is not set +# CONFIG_CMD_SPI is not set +# CONFIG_CMD_I2C is not set +# CONFIG_CMD_USB is not set +# CONFIG_CMD_FPGA is not set + +# +# Shell scripting commands +# +CONFIG_CMD_ECHO=y +# CONFIG_CMD_ITEST is not set +CONFIG_CMD_SOURCE=y +# CONFIG_CMD_SETEXPR is not set + +# +# Network commands +# +# CONFIG_CMD_NET is not set +# CONFIG_CMD_TFTPPUT is not set +# CONFIG_CMD_TFTPSRV is not set +# CONFIG_CMD_RARP is not set +# CONFIG_CMD_DHCP is not set +# CONFIG_CMD_NFS is not set +# CONFIG_CMD_PING is not set +# CONFIG_CMD_CDP is not set +# CONFIG_CMD_SNTP is not set +# CONFIG_CMD_DNS is not set +# CONFIG_CMD_LINK_LOCAL is not set + +# +# Misc commands +# +# CONFIG_CMD_TIME is not set +CONFIG_CMD_MISC=y +CONFIG_CMD_PART=y +CONFIG_PARTITION_UUIDS=y +# CONFIG_CMD_TIMER is not set + +# +# Boot timing +# +# CONFIG_BOOTSTAGE is not set +CONFIG_BOOTSTAGE_USER_COUNT=20 +CONFIG_BOOTSTAGE_STASH_ADDR=0 +CONFIG_BOOTSTAGE_STASH_SIZE=4096 + +# +# Power commands +# + +# +# Security commands +# +CONFIG_SUPPORT_OF_CONTROL=y + +# +# Device Tree Control +# +CONFIG_OF_CONTROL=y +CONFIG_OF_SEPARATE=y +# CONFIG_OF_EMBED is not set +CONFIG_NET=y +# CONFIG_NET_RANDOM_ETHADDR is not set +# CONFIG_NETCONSOLE is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_DM=y +CONFIG_DM_WARN=y +CONFIG_DM_DEVICE_REMOVE=y +CONFIG_DM_STDIO=y +CONFIG_DM_SEQ_ALIAS=y +# CONFIG_REGMAP is not set +# CONFIG_DEVRES is not set +CONFIG_SIMPLE_BUS=y +# CONFIG_CLK is not set +# CONFIG_CPU is not set + +# +# Hardware crypto devices +# +# CONFIG_FSL_CAAM is not set + +# +# Demo for driver model +# +# CONFIG_DM_DEMO is not set + +# +# DFU support +# +# CONFIG_DFU_TFTP is not set + +# +# GPIO Support +# +# CONFIG_LPC32XX_GPIO is not set +# CONFIG_VYBRID_GPIO is not set + +# +# I2C support +# +# CONFIG_IPQ806X_I2C is not set +# CONFIG_DM_I2C_COMPAT is not set +# CONFIG_CROS_EC_KEYB is not set + +# +# LED Support +# +# CONFIG_LED is not set + +# +# Multifunction device drivers +# +# CONFIG_CROS_EC is not set +# CONFIG_FSL_SEC_MON is not set +# CONFIG_PCA9551_LED is not set +# CONFIG_RESET is not set + +# +# NAND Device Support +# +# CONFIG_NAND_DENALI is not set +# CONFIG_NAND_VF610_NFC is not set +# CONFIG_NAND_PXA3XX is not set + +# +# Generic NAND options +# + +# +# SPI Flash Support +# +# CONFIG_SPI_FLASH is not set +# CONFIG_DM_ETH is not set +# CONFIG_PHYLIB is not set +# CONFIG_NETDEVICES is not set + +# +# PCI +# +# CONFIG_PCI_IPQ is not set +# CONFIG_DM_PCI is not set + +# +# Pin controllers +# +# CONFIG_PINCTRL is not set + +# +# Power +# +# CONFIG_DM_PMIC is not set +# CONFIG_DM_REGULATOR is not set +# CONFIG_RAM is not set + +# +# Real Time Clock +# +# CONFIG_DM_RTC is not set + +# +# Serial drivers +# +CONFIG_REQUIRE_SERIAL_CONSOLE=y +# CONFIG_DEBUG_UART is not set + +# +# Sound support +# +# CONFIG_SOUND is not set + +# +# SPI Support +# +# CONFIG_FSL_ESPI is not set +# CONFIG_TI_QSPI is not set +# CONFIG_DM_THERMAL is not set + +# +# USB support +# +# CONFIG_USB_XHCI_IPQ is not set +CONFIG_USB=y +CONFIG_DM_USB=y + +# +# Graphics support +# +# CONFIG_VIDEO_VESA is not set +# CONFIG_VIDEO_LCD_ANX9804 is not set +# CONFIG_VIDEO_LCD_SSD2828 is not set +# CONFIG_DISPLAY_PORT is not set +# CONFIG_VIDEO_TEGRA124 is not set +# CONFIG_VIDEO_BRIDGE is not set +# CONFIG_PHYS_TO_BUS is not set + +# +# File systems +# + +# +# Library routines +# +# CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set +CONFIG_HAVE_PRIVATE_LIBGCC=y +# CONFIG_USE_PRIVATE_LIBGCC is not set +CONFIG_SYS_HZ=1000 +# CONFIG_SYS_VSNPRINTF is not set +# CONFIG_REGEX is not set +# CONFIG_LIB_RAND is not set +# CONFIG_CMD_DHRYSTONE is not set +# CONFIG_RSA is not set +# CONFIG_TPM is not set + +# +# Hashing Support +# +# CONFIG_SHA1 is not set +# CONFIG_SHA256 is not set +# CONFIG_SHA_HW_ACCEL is not set + +# +# Compression Support +# +# CONFIG_LZ4 is not set +# CONFIG_ERRNO_STR is not set +# CONFIG_UNIT_TEST is not set diff --git a/include/configs/ipq806x.h b/include/configs/ipq806x.h index 48095cbed1..7071acdae5 100644 --- a/include/configs/ipq806x.h +++ b/include/configs/ipq806x.h @@ -48,7 +48,6 @@ #define CONFIG_MBN_HEADER #define CONFIG_IPQ_APPSBL_IMG_TYPE 0x5 -#define CONFIG_USB_XHCI_IPQ #ifdef CONFIG_USB_XHCI_IPQ #define CONFIG_USB_XHCI #define CONFIG_USB_XHCI_DWC3 @@ -134,7 +133,6 @@ /* * I2C Configs */ -#define CONFIG_IPQ806X_I2C 1 #ifdef CONFIG_IPQ806X_I2C #define CONFIG_SYS_I2C_QUP #define CONFIG_CMD_I2C @@ -144,7 +142,6 @@ /* * PCI Configs */ -#define CONFIG_PCI_IPQ #define PCI_MAX_DEVICES 3 #ifdef CONFIG_PCI_IPQ #define CONFIG_PCI