From ff39200468e34502e22855b2798c99e875cd5277 Mon Sep 17 00:00:00 2001 From: speriaka Date: Fri, 17 Nov 2017 12:22:14 +0530 Subject: [PATCH 1/4] ipq807x: uboot: MMC: Disabling default MMC init This patch involves changes which makes sure that MMC init is not done by default in uboot. It includes packages required for MMC init only if CONFIG_QCA_MMC is defined. This allows us to easily disable/enable MMC as and when required Change-Id: I8c64560aee71feed432238c2f9f71e2f6a24d5d9 Signed-off-by: speriaka --- configs/ipq807x_defconfig | 4 ---- include/configs/ipq807x.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/ipq807x_defconfig b/configs/ipq807x_defconfig index 0bcd5f5c29..15363753cd 100644 --- a/configs/ipq807x_defconfig +++ b/configs/ipq807x_defconfig @@ -71,7 +71,6 @@ CONFIG_CMD_FLASH=y # CONFIG_CMD_I2C is not set # CONFIG_CMD_USB is not set CONFIG_CMD_FPGA=y -CONFIG_CMD_MMC=y # # Shell scripting commands @@ -194,9 +193,6 @@ CONFIG_SIMPLE_BUS=y # MMC Host controller Support # # CONFIG_DM_MMC is not set -CONFIG_GENERIC_MMC=y -CONFIG_SDHCI=y -CONFIG_SDHCI_QCA=y # # NAND Device Support diff --git a/include/configs/ipq807x.h b/include/configs/ipq807x.h index bad69d47b6..c5c46c0a90 100644 --- a/include/configs/ipq807x.h +++ b/include/configs/ipq807x.h @@ -160,6 +160,10 @@ extern loff_t board_env_size; #ifdef CONFIG_QCA_MMC #define CONFIG_MMC +#define CONFIG_CMD_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_SDHCI +#define CONFIG_SDHCI_QCA #define CONFIG_EFI_PARTITION #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 From f9d9f949933919984b4558e4d8efaa8a70ac7973 Mon Sep 17 00:00:00 2001 From: speriaka Date: Fri, 17 Nov 2017 12:39:32 +0530 Subject: [PATCH 2/4] ipq807x: uboot: spi init: code clean up This patch involves changes which makes sure that spi init is done only when the config CONFIG_QCA_SPI is defined. Previously, since spi was a sub part of nand, spi_init was done without checking if CONFIG_QCA_SPI is enabled. This change will allow us to disable or enable spi as per our need in uboot. Change-Id: Ic75301872d5ac161cd7b863c59c12437aa6f7126 Signed-off-by: speriaka --- board/qca/arm/ipq807x/ipq807x.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/qca/arm/ipq807x/ipq807x.c b/board/qca/arm/ipq807x/ipq807x.c index aa17e8cd19..93fb1d569a 100644 --- a/board/qca/arm/ipq807x/ipq807x.c +++ b/board/qca/arm/ipq807x/ipq807x.c @@ -459,15 +459,19 @@ int board_mmc_init(bd_t *bis) void board_nand_init(void) { +#ifdef CONFIG_QCA_SPI int gpio_node; +#endif qpic_nand_init(); +#ifdef CONFIG_QCA_SPI gpio_node = fdt_path_offset(gd->fdt_blob, "/spi/spi_gpio"); if (gpio_node >= 0) { qca_gpio_init(gpio_node); ipq_spi_init(CONFIG_IPQ_SPI_NOR_INFO_IDX); } +#endif } static void pcie_clock_init(int id) From 9bebc1c4ea8ca13445d500cb57a82588db5fb541 Mon Sep 17 00:00:00 2001 From: speriaka Date: Fri, 17 Nov 2017 12:47:00 +0530 Subject: [PATCH 3/4] ipq807x: uboot: pci init: code clean up This patch involves changes which makes sure that pci init is done only when the config CONFIG_PCI_IPQ is defined. This change will allow us to disable or enable pci as per our need in uboot. Change-Id: I802de281938442d38451230c3aba340addd2f2ee Signed-off-by: speriaka --- board/qca/arm/ipq807x/ipq807x.c | 2 ++ board/qca/arm/ipq807x/ipq807x.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/board/qca/arm/ipq807x/ipq807x.c b/board/qca/arm/ipq807x/ipq807x.c index 93fb1d569a..43cccf8487 100644 --- a/board/qca/arm/ipq807x/ipq807x.c +++ b/board/qca/arm/ipq807x/ipq807x.c @@ -530,6 +530,7 @@ static void pcie_clock_deinit(int id) } } +#ifdef CONFIG_PCI_IPQ void board_pci_init(int id) { int node, gpio_node; @@ -580,6 +581,7 @@ void board_pci_deinit() return ; } +#endif void board_usb_deinit(int id) { diff --git a/board/qca/arm/ipq807x/ipq807x.h b/board/qca/arm/ipq807x/ipq807x.h index 58c222fe5b..a1ceef5f83 100644 --- a/board/qca/arm/ipq807x/ipq807x.h +++ b/board/qca/arm/ipq807x/ipq807x.h @@ -236,7 +236,9 @@ extern const char *del_node[]; extern const add_node_t add_node[]; void reset_crashdump(void); +#ifdef CONFIG_PCI_IPQ void board_pci_init(int id); +#endif void ipq_fdt_fixup_socinfo(void *blob); int ipq_board_usb_init(void); From 58ec68d67e6efe8682ca9cf4cf199c0f45445e23 Mon Sep 17 00:00:00 2001 From: speriaka Date: Fri, 17 Nov 2017 14:32:17 +0530 Subject: [PATCH 4/4] ipq807x: uboot: usb init: code clean up This patch involves changes which makes sure that usb init is done only when the config CONFIG_USB_XHCI_IPQ is defined. This change will allow us to disable or enable usb init as per our need in uboot. Change-Id: Icc0213470734856e763cddea747f17e3bc1ba51d Signed-off-by: speriaka --- board/qca/arm/ipq807x/ipq807x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/qca/arm/ipq807x/ipq807x.c b/board/qca/arm/ipq807x/ipq807x.c index 43cccf8487..86dfbbcf12 100644 --- a/board/qca/arm/ipq807x/ipq807x.c +++ b/board/qca/arm/ipq807x/ipq807x.c @@ -583,6 +583,7 @@ void board_pci_deinit() } #endif +#ifdef CONFIG_USB_XHCI_IPQ void board_usb_deinit(int id) { void __iomem *boot_clk_ctl, *usb_bcr, *qusb2_phy_bcr; @@ -874,6 +875,7 @@ int ipq_board_usb_init(void) } return 0; } +#endif void ipq_fdt_fixup_socinfo(void *blob) {