[coreboot-gerrit] Patch set updated for coreboot: soc/qualcomm/ipq40xx: Update ipq806x/storm references
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Mon May 9 14:05:47 CEST 2016
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14648
-gerrit
commit 91a65f6020a4bd239c8da6e586448d2056b48fac
Author: Varadarajan Narayanan <varada at codeaurora.org>
Date: Mon Mar 7 13:37:58 2016 +0530
soc/qualcomm/ipq40xx: Update ipq806x/storm references
Since the files were taken from ipq806x/storm as
template. Update those references to reflect
ipq40xx/gale.
BUG=chrome-os-partner:49249
TEST=None. Initial code not sure if it will even compile
BRANCH=none
Change-Id: I212c22b55ec1ba070d4e7245e93518cb51854fb8
Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
Original-Commit-Id: c6c76d184cc92c09e6826fbdc7d7fac59b2cb69b
Original-Change-Id: Ieae1bce25291243b4a6034d37a6949978f318997
Original-Signed-off-by: Varadarajan Narayanan <varada at codeaurora.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/333293
Original-Commit-Ready: David Hendricks <dhendrix at chromium.org>
Original-Tested-by: David Hendricks <dhendrix at chromium.org>
Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
---
src/soc/qualcomm/ipq40xx/Kconfig | 10 +++++-----
src/soc/qualcomm/ipq40xx/Makefile.inc | 6 +++---
src/soc/qualcomm/ipq40xx/include/soc/cdp.h | 14 +++++++-------
src/soc/qualcomm/ipq40xx/include/soc/clock.h | 6 +++---
src/soc/qualcomm/ipq40xx/include/soc/ebi2.h | 4 ++--
src/soc/qualcomm/ipq40xx/include/soc/gpio.h | 6 +++---
src/soc/qualcomm/ipq40xx/include/soc/iomap.h | 6 +++---
src/soc/qualcomm/ipq40xx/include/soc/ipq_uart.h | 2 +-
src/soc/qualcomm/ipq40xx/include/soc/lcc-reg.h | 6 +++---
src/soc/qualcomm/ipq40xx/include/soc/soc_services.h | 4 ++--
src/soc/qualcomm/ipq40xx/include/soc/spi.h | 6 +++---
src/soc/qualcomm/ipq40xx/include/soc/usb.h | 6 +++---
src/soc/qualcomm/ipq40xx/include/soc/usbl_if.h | 4 ++--
src/soc/qualcomm/ipq40xx/mbn_header.h | 6 +++---
src/soc/qualcomm/ipq40xx/soc.c | 8 ++++----
src/soc/qualcomm/ipq40xx/uart.c | 8 ++++----
16 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig
index aeb59ff..a122ac9 100644
--- a/src/soc/qualcomm/ipq40xx/Kconfig
+++ b/src/soc/qualcomm/ipq40xx/Kconfig
@@ -1,4 +1,4 @@
-config SOC_QC_IPQ806X
+config SOC_QC_IPQ40XX
bool
default n
select ARCH_BOOTBLOCK_ARMV7
@@ -10,7 +10,7 @@ config SOC_QC_IPQ806X
select SPI_ATOMIC_SEQUENCING
select GENERIC_GPIO_LIB
-if SOC_QC_IPQ806X
+if SOC_QC_IPQ40XX
config CHROMEOS
select CHROMEOS_VBNV_FLASH
@@ -19,16 +19,16 @@ config CHROMEOS
config MBN_ENCAPSULATION
depends on USE_BLOBS
- bool "bootblock encapsulation for ipq8064"
+ bool "bootblock encapsulation for ipq40xx"
default y
config SBL_BLOB
depends on USE_BLOBS
string "file name of the Qualcomm SBL blob"
- default "3rdparty/blobs/cpu/qualcomm/ipq806x/uber-sbl.mbn"
+ default "3rdparty/blobs/cpu/qualcomm/ipq40xx/uber-sbl.mbn"
help
The path and filename of the binary blob containing
- ipq806x early initialization code, as supplied by the
+ ipq40xx early initialization code, as supplied by the
vendor.
endif
diff --git a/src/soc/qualcomm/ipq40xx/Makefile.inc b/src/soc/qualcomm/ipq40xx/Makefile.inc
index ffb8752..95a78b3 100644
--- a/src/soc/qualcomm/ipq40xx/Makefile.inc
+++ b/src/soc/qualcomm/ipq40xx/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-ifeq ($(CONFIG_SOC_QC_IPQ806X),y)
+ifeq ($(CONFIG_SOC_QC_IPQ40XX),y)
bootblock-y += clock.c
bootblock-y += gpio.c
@@ -67,13 +67,13 @@ $(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_BLOB)) \
endif
-CPPFLAGS_common += -Isrc/soc/qualcomm/ipq806x/include
+CPPFLAGS_common += -Isrc/soc/qualcomm/ipq40xx/include
# List of binary blobs coreboot needs in CBFS to be able to boot up this SOC
mbn-files := cdt.mbn ddr.mbn rpm.mbn tz.mbn
# Location of the binary blobs
-mbn-root := 3rdparty/blobs/cpu/qualcomm/ipq806x
+mbn-root := 3rdparty/blobs/cpu/qualcomm/ipq40xx
# Create make variables to aid cbfs-files-handler in processing the blobs (add
# them all as raw binaries at the root level).
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/cdp.h b/src/soc/qualcomm/ipq40xx/include/soc/cdp.h
index c63a937..57c679e 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/cdp.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/cdp.h
@@ -28,8 +28,8 @@
*/
-#ifndef _IPQ806X_CDP_H_
-#define _IPQ806X_CDP_H_
+#ifndef _IPQ40XX_CDP_H_
+#define _IPQ40XX_CDP_H_
#include <types.h>
@@ -133,7 +133,7 @@ typedef struct {
#define IPQ_GMAC_NMACS 4
-enum storm_board_id {
+enum gale_board_id {
BOARD_ID_PROTO_0 = 0,
BOARD_ID_PROTO_0_2 = 1,
BOARD_ID_WHIRLWIND = 2,
@@ -150,9 +150,9 @@ typedef struct {
flash_desc flashdesc;
spinorflash_params_t flash_param;
#endif
-} __attribute__ ((__packed__)) board_ipq806x_params_t;
+} __attribute__ ((__packed__)) board_ipq40xx_params_t;
-extern board_ipq806x_params_t *gboard_param;
+extern board_ipq40xx_params_t *gboard_param;
#if 0
static inline int gmac_cfg_is_valid(ipq_gmac_board_cfg_t *cfg)
@@ -161,7 +161,7 @@ static inline int gmac_cfg_is_valid(ipq_gmac_board_cfg_t *cfg)
* 'cfg' is valid if and only if
* unit number is non-negative and less than IPQ_GMAC_NMACS.
* 'cfg' pointer lies within the array range of
- * board_ipq806x_params_t->gmac_cfg[]
+ * board_ipq40xx_params_t->gmac_cfg[]
*/
return ((cfg >= &gboard_param->gmac_cfg[0]) &&
(cfg < &gboard_param->gmac_cfg[IPQ_GMAC_NMACS]) &&
@@ -174,4 +174,4 @@ void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned count);
void board_nand_init(void);
-#endif /* _IPQ806X_CDP_H_ */
+#endif /* _IPQ40XX_CDP_H_ */
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/clock.h b/src/soc/qualcomm/ipq40xx/include/soc/clock.h
index 29bbb55..51cc228 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/clock.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/clock.h
@@ -28,8 +28,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __IPQ860X_CLOCK_H_
-#define __IPQ860X_CLOCK_H_
+#ifndef __IPQ40XX_CLOCK_H_
+#define __IPQ40XX_CLOCK_H_
#include <soc/iomap.h>
@@ -211,4 +211,4 @@ void nand_clock_config(void);
void usb_clock_config(void);
int audio_clock_config(unsigned frequency);
-#endif /* __PLATFORM_IPQ860X_CLOCK_H_ */
+#endif /* __PLATFORM_IPQ40XX_CLOCK_H_ */
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h b/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h
index 3636768..1cc04ae 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h
@@ -28,8 +28,8 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __SOC_QUALCOMM_IPQ806X_EBI2_H_
-#define __SOC_QUALCOMM_IPQ806X_EBI2_H_
+#ifndef __SOC_QUALCOMM_IPQ40XX_EBI2_H_
+#define __SOC_QUALCOMM_IPQ40XX_EBI2_H_
#define EBI2CR_BASE (0x1A600000)
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/gpio.h b/src/soc/qualcomm/ipq40xx/include/soc/gpio.h
index f7146fe..6304f71 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/gpio.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/gpio.h
@@ -28,8 +28,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __SOC_QUALCOMM_IPQ806X_GPIO_H_
-#define __SOC_QUALCOMM_IPQ806X_GPIO_H_
+#ifndef __SOC_QUALCOMM_IPQ40XX_GPIO_H_
+#define __SOC_QUALCOMM_IPQ40XX_GPIO_H_
#include <types.h>
@@ -107,4 +107,4 @@ static inline void gpio_tlmm_config(unsigned int gpio, unsigned int func,
{
gpio_tlmm_config_set(gpio, func, pull, drvstr, enable);
}
-#endif // __SOC_QUALCOMM_IPQ806X_GPIO_H_
+#endif // __SOC_QUALCOMM_IPQ40XX_GPIO_H_
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/iomap.h b/src/soc/qualcomm/ipq40xx/include/soc/iomap.h
index 4a3aa49..543356d 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/iomap.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/iomap.h
@@ -33,8 +33,8 @@
* SUCH DAMAGE.
*/
-#ifndef __SOC_QUALCOMM_IPQ806X_IOMAP_H_
-#define __SOC_QUALCOMM_IPQ806X_IOMAP_H_
+#ifndef __SOC_QUALCOMM_IPQ40XX_IOMAP_H_
+#define __SOC_QUALCOMM_IPQ40XX_IOMAP_H_
#include <arch/io.h>
#include <soc/cdp.h>
@@ -162,4 +162,4 @@
(32*(gsbi_n-1)))
#define GSBI_HCLK_CTL(n) ((MSM_CLK_CTL_BASE + 0x29C0) + \
(32*(n-1)))
-#endif // __SOC_QUALCOMM_IPQ806X_IOMAP_H_
+#endif // __SOC_QUALCOMM_IPQ40XX_IOMAP_H_
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/ipq_uart.h b/src/soc/qualcomm/ipq40xx/include/soc/ipq_uart.h
index 1c994a3..25a06bf 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/ipq_uart.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/ipq_uart.h
@@ -268,6 +268,6 @@ enum MSM_BOOT_UART_DM_BITS_PER_CHAR {
#define MSM_BOOT_UART_DM_E_MALLOC_FAIL 4
#define MSM_BOOT_UART_DM_E_RX_NOT_READY 5
-void ipq806x_uart_init(void);
+void ipq40xx_uart_init(void);
#endif /* __UART_DM_H__ */
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/lcc-reg.h b/src/soc/qualcomm/ipq40xx/include/soc/lcc-reg.h
index 2827ac9..9cf3758 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/lcc-reg.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/lcc-reg.h
@@ -27,8 +27,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __DRIVERS_CLOCK_IPQ806X_LCC_REG_H__
-#define __DRIVERS_CLOCK_IPQ806X_LCC_REG_H__
+#ifndef __DRIVERS_CLOCK_IPQ40XX_LCC_REG_H__
+#define __DRIVERS_CLOCK_IPQ40XX_LCC_REG_H__
#define MSM_GCC_BASE 0x00900000
#define MSM_LPASS_LCC_BASE 0x28000000
@@ -338,4 +338,4 @@
#define LCC_PLL_SCLK_MUX_PLL1 (0 << LCC_PLL_SCLK_MUX_SHIFT)
#define LCC_PLL_SCLK_MUX_PLL0 (1 << LCC_PLL_SCLK_MUX_SHIFT)
-#endif /* __DRIVERS_CLOCK_IPQ806X_LCC_REG_H__ */
+#endif /* __DRIVERS_CLOCK_IPQ40XX_LCC_REG_H__ */
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/soc_services.h b/src/soc/qualcomm/ipq40xx/include/soc/soc_services.h
index 7006b82..5ad11f1 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/soc_services.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/soc_services.h
@@ -13,8 +13,8 @@
* GNU General Public License for more details.
*/
-#ifndef __SOC_QUALCOMM_IPQ806X_INCLUDE_SOC_SOC_SERVICES_H__
-#define __SOC_QUALCOMM_IPQ806X_INCLUDE_SOC_SOC_SERVICES_H__
+#ifndef __SOC_QUALCOMM_IPQ40XX_INCLUDE_SOC_SOC_SERVICES_H__
+#define __SOC_QUALCOMM_IPQ40XX_INCLUDE_SOC_SOC_SERVICES_H__
#include <types.h>
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/spi.h b/src/soc/qualcomm/ipq40xx/include/soc/spi.h
index adc5eeb..8e52d62 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/spi.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/spi.h
@@ -29,8 +29,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _IPQ806X_SPI_H_
-#define _IPQ806X_SPI_H_
+#ifndef _IPQ40XX_SPI_H_
+#define _IPQ40XX_SPI_H_
#include <spi_flash.h>
#include <soc/iomap.h>
@@ -302,4 +302,4 @@ static inline struct ipq_spi_slave *to_ipq_spi(struct spi_slave *slave)
return container_of(slave, struct ipq_spi_slave, slave);
}
-#endif /* _IPQ_SPI_H_ */
+#endif /* _IPQ40XX_SPI_H_ */
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/usb.h b/src/soc/qualcomm/ipq40xx/include/soc/usb.h
index 88883a2..457ead7 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/usb.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/usb.h
@@ -13,10 +13,10 @@
* GNU General Public License for more details.
*/
-#ifndef _IPQ806X_USB_H_
-#define _IPQ806X_USB_H_
+#ifndef _IPQ40XX_USB_H_
+#define _IPQ40XX_USB_H_
void setup_usb_host1(void);
void setup_usb_host2(void);
-#endif /* _IPQ806X_USB_H_ */
+#endif /* _IPQ40XX_USB_H_ */
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/usbl_if.h b/src/soc/qualcomm/ipq40xx/include/soc/usbl_if.h
index 5ca784d..134b63f 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/usbl_if.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/usbl_if.h
@@ -29,8 +29,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __SOC_QUALCOMM_IPQ806X_INCLUDE_SOC_USBL_IF_H__
-#define __SOC_QUALCOMM_IPQ806X_INCLUDE_SOC_USBL_IF_H__
+#ifndef __SOC_QUALCOMM_IPQ40XX_INCLUDE_SOC_USBL_IF_H__
+#define __SOC_QUALCOMM_IPQ40XX_INCLUDE_SOC_USBL_IF_H__
#include <types.h>
diff --git a/src/soc/qualcomm/ipq40xx/mbn_header.h b/src/soc/qualcomm/ipq40xx/mbn_header.h
index 1e6a32f..cedcf12 100644
--- a/src/soc/qualcomm/ipq40xx/mbn_header.h
+++ b/src/soc/qualcomm/ipq40xx/mbn_header.h
@@ -13,12 +13,12 @@
* GNU General Public License for more details.
*/
-#ifndef __SOC_QUALCOMM_IPQ806X_MBN_HEADER_H__
-#define __SOC_QUALCOMM_IPQ806X_MBN_HEADER_H__
+#ifndef __SOC_QCA_IPQ40XX_MBN_HEADER_H__
+#define __SOC_QCA_IPQ40XX_MBN_HEADER_H__
#include <types.h>
-/* Qualcomm firmware blob header gleaned from util/ipqheader/ipqheader.py */
+/* QCA firmware blob header gleaned from util/ipqheader/ipqheader.py */
struct mbn_header {
u32 mbn_type;
diff --git a/src/soc/qualcomm/ipq40xx/soc.c b/src/soc/qualcomm/ipq40xx/soc.c
index e44964f..201e9bc 100644
--- a/src/soc/qualcomm/ipq40xx/soc.c
+++ b/src/soc/qualcomm/ipq40xx/soc.c
@@ -36,9 +36,9 @@ static void soc_init(device_t dev)
* Do this in case console is not enabled: kernel's earlyprintk()
* should work no matter what the firmware console configuration is.
*/
- ipq806x_uart_init();
+ ipq40xx_uart_init();
- printk(BIOS_INFO, "CPU: Qualcomm 8064\n");
+ printk(BIOS_INFO, "CPU: QCA 40xx\n");
}
static struct device_operations soc_ops = {
@@ -51,7 +51,7 @@ static void enable_soc_dev(device_t dev)
dev->ops = &soc_ops;
}
-struct chip_operations soc_qualcomm_ipq806x_ops = {
- CHIP_NAME("SOC Qualcomm 8064")
+struct chip_operations soc_qualcomm_ipq40xx_ops = {
+ CHIP_NAME("SOC QCA 40xx")
.enable_dev = enable_soc_dev,
};
diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c
index bd9d071..99b2b05 100644
--- a/src/soc/qualcomm/ipq40xx/uart.c
+++ b/src/soc/qualcomm/ipq40xx/uart.c
@@ -52,7 +52,7 @@ typedef struct {
/*
* All constants lifted from u-boot's
- * board/qcom/ipq806x_cdp/ipq806x_board_param.h
+ * board/qcom/ipq40xx_cdp/ipq40xx_board_param.h
*/
static const uart_params_t uart_board_param = {
.uart_dm_base = (void *)UART4_DM_BASE,
@@ -295,7 +295,7 @@ static unsigned int msm_boot_uart_dm_init(void *uart_dm_base)
}
/**
- * ipq806x_uart_init - initializes UART
+ * ipq40xx_uart_init - initializes UART
*
* Initializes clocks, GPIO and UART controller.
*/
@@ -330,7 +330,7 @@ void uart_init(int idx)
}
/* for the benefit of non-console uart init */
-void ipq806x_uart_init(void)
+void ipq40xx_uart_init(void)
{
uart_init(0);
}
@@ -378,7 +378,7 @@ int uart_can_rx_byte(void)
#if IS_ENABLED(CONFIG_DRIVERS_UART)
/**
- * ipq806x_serial_getc - reads a character
+ * ipq40xx_serial_getc - reads a character
*
* Returns the character read from serial port.
*/
More information about the coreboot-gerrit
mailing list