mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipq9574: Change references of ipq9048 to ipq9574

Browse source 
Signed-off-by: anusha <anusharao@codeaurora.org>
Change-Id: I306a9eae54aa31b3153ad3ebf58f73b6a973a710
This commit is contained in:
anusha 2021-03-18 18:16:49 +05:30 • committed by Gerrit - the friendly Code Review server
parent a5174ca51e
commit f2723a7b17
21 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -581,7 +581,7 @@ else
ifdef CONFIG_ARCH_IPQ6018 ifdef CONFIG_ARCH_IPQ6018
KBUILD_CFLAGS += $(call cc-option,-fstack-protector) KBUILD_CFLAGS += $(call cc-option,-fstack-protector)
else else
ifdef CONFIG_ARCH_IPQ9048 ifdef CONFIG_ARCH_IPQ9574
KBUILD_CFLAGS += $(call cc-option,-fstack-protector) KBUILD_CFLAGS += $(call cc-option,-fstack-protector)
else else
KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)

6
arch/arm/Kconfig
View file

@ -469,8 +469,8 @@ config ARCH_IPQ6018
select SYS_GENERIC_BOARD select SYS_GENERIC_BOARD
select QCA_COMMON select QCA_COMMON
config ARCH_IPQ9048 config ARCH_IPQ9574
bool "QCA, IPQ9048" bool "QCA, IPQ9574"
select DM select DM
select DM_SERIAL select DM_SERIAL
select CPU_V7 select CPU_V7
@ -868,7 +868,7 @@ source "board/ipq40xx/Kconfig"
source "board/ipq5018/Kconfig" source "board/ipq5018/Kconfig"
source "board/ipq6018/Kconfig" source "board/ipq6018/Kconfig"
source "board/ipq806x/Kconfig" source "board/ipq806x/Kconfig"
source "board/ipq9048/Kconfig" source "board/ipq9574/Kconfig"
source "board/ipq807x/Kconfig" source "board/ipq807x/Kconfig"
source "board/isee/igep0033/Kconfig" source "board/isee/igep0033/Kconfig"
source "board/maxbcm/Kconfig" source "board/maxbcm/Kconfig"

2
arch/arm/cpu/armv7/start.S
View file

@ -48,7 +48,7 @@ save_boot_params_ret:
msr cpsr,r0 msr cpsr,r0
#if defined (CONFIG_ARCH_IPQ807x) || defined (CONFIG_ARCH_IPQ6018) \ #if defined (CONFIG_ARCH_IPQ807x) || defined (CONFIG_ARCH_IPQ6018) \
|| defined (CONFIG_ARCH_IPQ5018) || defined (CONFIG_ARCH_IPQ9048) || defined (CONFIG_ARCH_IPQ5018) || defined (CONFIG_ARCH_IPQ9574)
/* Setup CP15 barrier */ /* Setup CP15 barrier */
mrc p15, 0, r0, c1, c0, 0 @Read SCTLR to r0 mrc p15, 0, r0, c1, c0, 0 @Read SCTLR to r0
orr r0, r0, #0x20 @set the cp15 barrier enable bit orr r0, r0, #0x20 @set the cp15 barrier enable bit

2
arch/arm/dts/Makefile
View file

@ -94,7 +94,7 @@ dtb-$(CONFIG_ARCH_IPQ6018) += ipq6018-cp01-c1.dtb \
ipq6018-db-cp01.dtb \ ipq6018-db-cp01.dtb \
ipq6018-db-cp02.dtb ipq6018-db-cp02.dtb
dtb-$(CONFIG_ARCH_IPQ9048) += ipq9048-emulation.dtb dtb-$(CONFIG_ARCH_IPQ9574) += ipq9574-emulation.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += \ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3288-firefly.dtb \ rk3288-firefly.dtb \

6
arch/arm/dts/ipq9574-emulation.dts
View file

@ -12,10 +12,10 @@
*/ */
/dts-v1/; /dts-v1/;
#include "ipq9048-soc.dtsi" #include "ipq9574-soc.dtsi"
/ { / {
model ="QCA, IPQ9048-EMULATION"; model ="QCA, IPQ9574-EMULATION";
compatible = "qca,ipq9048", "qca,ipq9048-emulation"; compatible = "qca,ipq9574", "qca,ipq9574-emulation";
machid = <0xf030000>; machid = <0xf030000>;
config_name = "config@1"; config_name = "config@1";

2
arch/arm/dts/ipq9574-soc.dtsi
View file

@ -12,7 +12,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/qcom/gpio-ipq9048.h> #include <dt-bindings/qcom/gpio-ipq9574.h>
/ { / {

8
arch/arm/include/asm/arch-ipq9574/clk.h
View file

@ -11,13 +11,13 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef IPQ9048_CLK_H #ifndef IPQ9574_CLK_H
#define IPQ9048_CLK_H #define IPQ9574_CLK_H
#include <asm/arch-qca-common/uart.h> #include <asm/arch-qca-common/uart.h>
/* I2C clocks configuration */ /* I2C clocks configuration */
#ifdef CONFIG_IPQ9048_I2C #ifdef CONFIG_IPQ9574_I2C
#define GCC_BLSP1_QUP1_I2C_APPS_CFG_RCGR 0x180201C #define GCC_BLSP1_QUP1_I2C_APPS_CFG_RCGR 0x180201C
#define GCC_BLSP1_QUP1_I2C_APPS_CFG_RCGR_SRC_SEL (1 << 8) #define GCC_BLSP1_QUP1_I2C_APPS_CFG_RCGR_SRC_SEL (1 << 8)
@ -75,4 +75,4 @@ void i2c_clock_config(void);
int uart_clock_config(struct ipq_serial_platdata *plat); int uart_clock_config(struct ipq_serial_platdata *plat);
#endif /*IPQ9048_CLK_H*/ #endif /*IPQ9574_CLK_H*/

4
arch/arm/include/asm/arch-qca-common/qca_common.h
View file

@ -25,8 +25,8 @@
#include <asm/arch-ipq6018/clk.h> #include <asm/arch-ipq6018/clk.h>
#endif #endif
#ifdef CONFIG_ARCH_IPQ9048 #ifdef CONFIG_ARCH_IPQ9574
#include <asm/arch-ipq9048/clk.h> #include <asm/arch-ipq9574/clk.h>
#endif #endif
#ifdef CONFIG_ARCH_IPQ807x #ifdef CONFIG_ARCH_IPQ807x

2
arch/arm/include/asm/arch-qca-common/qpic_nand.h
View file

@ -32,7 +32,7 @@
#if defined(CONFIG_IPQ40XX) || defined(CONFIG_IPQ_RUMI) \ #if defined(CONFIG_IPQ40XX) || defined(CONFIG_IPQ_RUMI) \
|| defined(CONFIG_IPQ6018) || defined(CONFIG_IPQ5018) \ || defined(CONFIG_IPQ6018) || defined(CONFIG_IPQ5018) \
|| defined(CONFIG_IPQ9048) || defined(CONFIG_IPQ9574)
#define QPIC_EBI2ND_BASE (0x079b0000) #define QPIC_EBI2ND_BASE (0x079b0000)
#else #else
#error "QPIC NAND not supported" #error "QPIC NAND not supported"

8
board/ipq9574/Kconfig
View file

@ -1,15 +1,15 @@
if ARCH_IPQ9048 if ARCH_IPQ9574
config SYS_CPU config SYS_CPU
default "ipq9048" default "ipq9574"
config SYS_BOARD config SYS_BOARD
default "ipq9048" default "ipq9574"
config SYS_VENDOR config SYS_VENDOR
default "qca/arm" default "qca/arm"
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "ipq9048" default "ipq9574"
endif endif

6
board/qca/arm/ipq9574/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y += -I$(srctree)/board/qca/arm/ipq9048 ccflags-y += -I$(srctree)/board/qca/arm/ipq9574
cppflags-y += -I$(srctree)/board/qca/arm/ipq9048 cppflags-y += -I$(srctree)/board/qca/arm/ipq9574
obj-y := ipq9048.o obj-y := ipq9574.o
obj-y += clock.o obj-y += clock.o

6
board/qca/arm/ipq9574/clock.c
View file

@ -13,13 +13,13 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch-ipq9048/clk.h> #include <asm/arch-ipq9574/clk.h>
#include <asm/errno.h> #include <asm/errno.h>
#ifdef CONFIG_IPQ9048_I2C #ifdef CONFIG_IPQ9574_I2C
void i2c_clock_config(void) void i2c_clock_config(void)
{ {
#ifndef CONFIG_IPQ9048_RUMI #ifndef CONFIG_IPQ9574_RUMI
int cfg; int cfg;
/* Configure qup1_i2c_apps_clk_src */ /* Configure qup1_i2c_apps_clk_src */

10
board/qca/arm/ipq9574/ipq9574.c
View file

@ -23,7 +23,7 @@
#include <asm/arch-qca-common/uart.h> #include <asm/arch-qca-common/uart.h>
#include <asm/arch-qca-common/scm.h> #include <asm/arch-qca-common/scm.h>
#include <asm/arch-qca-common/iomap.h> #include <asm/arch-qca-common/iomap.h>
#include <ipq9048.h> #include <ipq9574.h>
#include <mmc.h> #include <mmc.h>
#include <sdhci.h> #include <sdhci.h>
#include <usb.h> #include <usb.h>
@ -83,7 +83,7 @@ void fdt_fixup_qpic(void *blob)
#ifdef CONFIG_QPIC_NAND #ifdef CONFIG_QPIC_NAND
void qpic_set_clk_rate(unsigned int clk_rate, int blk_type, int req_clk_src_type) void qpic_set_clk_rate(unsigned int clk_rate, int blk_type, int req_clk_src_type)
{ {
#ifndef CONFIG_IPQ9048_RUMI #ifndef CONFIG_IPQ9574_RUMI
switch (blk_type) { switch (blk_type) {
case QPIC_IO_MACRO_CLK: case QPIC_IO_MACRO_CLK:
/* select the clk source for IO_PAD_MACRO /* select the clk source for IO_PAD_MACRO
@ -170,7 +170,7 @@ void board_nand_init(void)
#ifdef CONFIG_QCA_MMC #ifdef CONFIG_QCA_MMC
void emmc_clock_config(void) void emmc_clock_config(void)
{ {
#ifndef CONFIG_IPQ9048_RUMI #ifndef CONFIG_IPQ9574_RUMI
int cfg; int cfg;
/* Configure sdcc1_apps_clk_src */ /* Configure sdcc1_apps_clk_src */
@ -210,7 +210,7 @@ void sdhci_bus_pwr_off(struct sdhci_host *host)
void emmc_clock_disable(void) void emmc_clock_disable(void)
{ {
#ifndef CONFIG_IPQ9048_RUMI #ifndef CONFIG_IPQ9574_RUMI
/* Clear divider */ /* Clear divider */
writel(0x0, GCC_SDCC1_MISC); writel(0x0, GCC_SDCC1_MISC);
#endif #endif
@ -223,7 +223,7 @@ void board_mmc_deinit(void)
void emmc_clock_reset(void) void emmc_clock_reset(void)
{ {
#ifndef CONFIG_IPQ9048_RUMI #ifndef CONFIG_IPQ9574_RUMI
writel(0x1, GCC_SDCC1_BCR); writel(0x1, GCC_SDCC1_BCR);
udelay(10); udelay(10);
writel(0x0, GCC_SDCC1_BCR); writel(0x0, GCC_SDCC1_BCR);

8
board/qca/arm/ipq9574/ipq9574.h
View file

@ -11,10 +11,10 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _IPQ9048_CDP_H_ #ifndef _IPQ9574_CDP_H_
#define _IPQ9048_CDP_H_ #define _IPQ9574_CDP_H_
#include <configs/ipq9048.h> #include <configs/ipq9574.h>
#include <asm/u-boot.h> #include <asm/u-boot.h>
#include <asm/arch-qca-common/qca_common.h> #include <asm/arch-qca-common/qca_common.h>
@ -328,4 +328,4 @@ extern const add_node_t add_fdt_node[];
int ipq_get_tz_version(char *version_name, int buf_size); int ipq_get_tz_version(char *version_name, int buf_size);
void ipq_fdt_fixup_socinfo(void *blob); void ipq_fdt_fixup_socinfo(void *blob);
int ipq_board_usb_init(void); int ipq_board_usb_init(void);
#endif /* _IPQ9048_CDP_H_ */ #endif /* _IPQ9574_CDP_H_ */

4
configs/ipq9574_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_HAS_VBAR=y CONFIG_HAS_VBAR=y
CONFIG_CPU_V7=y CONFIG_CPU_V7=y
CONFIG_ARCH_IPQ9048=y CONFIG_ARCH_IPQ9574=y
CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SYS_MALLOC_F_LEN=0x400
CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
@ -15,7 +15,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
# CONFIG_FIT_SIGNATURE is not set # CONFIG_FIT_SIGNATURE is not set
CONFIG_SYS_EXTRA_OPTIONS="" CONFIG_SYS_EXTRA_OPTIONS=""
CONFIG_SYS_PROMPT="IPQ9048# " CONFIG_SYS_PROMPT="IPQ9574# "
# #
# Commands # Commands

2
drivers/gpio/Makefile
View file

@ -10,7 +10,7 @@ obj-$(CONFIG_ARCH_IPQ806x) += ipq_gpio.o
obj-$(CONFIG_ARCH_IPQ40xx) += ipq_gpio.o obj-$(CONFIG_ARCH_IPQ40xx) += ipq_gpio.o
obj-$(CONFIG_ARCH_IPQ5018) += ipq_gpio.o obj-$(CONFIG_ARCH_IPQ5018) += ipq_gpio.o
obj-$(CONFIG_ARCH_IPQ6018) += ipq_gpio.o obj-$(CONFIG_ARCH_IPQ6018) += ipq_gpio.o
obj-$(CONFIG_ARCH_IPQ9048) += ipq_gpio.o obj-$(CONFIG_ARCH_IPQ9574) += ipq_gpio.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_DWAPB_GPIO) += dwapb_gpio.o obj-$(CONFIG_DWAPB_GPIO) += dwapb_gpio.o
obj-$(CONFIG_AXP_GPIO) += axp_gpio.o obj-$(CONFIG_AXP_GPIO) += axp_gpio.o

2
drivers/serial/Makefile
View file

@ -13,7 +13,7 @@ obj-$(CONFIG_ARCH_IPQ806x) += qca_uart.o
obj-$(CONFIG_ARCH_IPQ40xx) += qca_uart.o obj-$(CONFIG_ARCH_IPQ40xx) += qca_uart.o
obj-$(CONFIG_ARCH_IPQ5018) += qca_uart.o obj-$(CONFIG_ARCH_IPQ5018) += qca_uart.o
obj-$(CONFIG_ARCH_IPQ6018) += qca_uart.o obj-$(CONFIG_ARCH_IPQ6018) += qca_uart.o
obj-$(CONFIG_ARCH_IPQ9048) += qca_uart.o obj-$(CONFIG_ARCH_IPQ9574) += qca_uart.o
ifdef CONFIG_DM_SERIAL ifdef CONFIG_DM_SERIAL
obj-y += serial-uclass.o obj-y += serial-uclass.o
obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o

2
drivers/spi/Makefile
View file

@ -37,7 +37,7 @@ obj-$(CONFIG_ARCH_IPQ40xx) += qca_qup_spi_bam.o
obj-$(CONFIG_ARCH_IPQ807x) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ807x) += qca_qup_spi_bam.o
obj-$(CONFIG_ARCH_IPQ6018) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ6018) += qca_qup_spi_bam.o
obj-$(CONFIG_ARCH_IPQ5018) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ5018) += qca_qup_spi_bam.o
obj-$(CONFIG_ARCH_IPQ9048) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ9574) += qca_qup_spi_bam.o
obj-$(CONFIG_ARCH_IPQ806x) += ipq_spi.o obj-$(CONFIG_ARCH_IPQ806x) += ipq_spi.o
endif endif

6
include/common.h
View file

@ -41,8 +41,8 @@ typedef volatile unsigned char vu_char;
#elif defined(CONFIG_IPQ6018) #elif defined(CONFIG_IPQ6018)
#include <../board/qca/arm/ipq6018/ipq6018.h> #include <../board/qca/arm/ipq6018/ipq6018.h>
#elif defined(CONFIG_IPQ9048) #elif defined(CONFIG_IPQ9574)
#include <../board/qca/arm/ipq9048/ipq9048.h> #include <../board/qca/arm/ipq9574/ipq9574.h>
#elif defined(CONFIG_IPQ_RUMI) #elif defined(CONFIG_IPQ_RUMI)
#include <../board/qca/arm/ipq807x/ipq807x.h> #include <../board/qca/arm/ipq807x/ipq807x.h>
@ -416,7 +416,7 @@ ulong getenv_hex(const char *varname, ulong default_val);
* Return -1 if variable does not exist (default to true) * Return -1 if variable does not exist (default to true)
*/ */
int getenv_yesno(const char *var); int getenv_yesno(const char *var);
#if defined(CONFIG_IPQ40XX_ENV) || defined(CONFIG_IPQ807X_ENV) || defined(CONFIG_IPQ806X_ENV) || defined(CONFIG_IPQ5018_ENV) || defined(CONFIG_IPQ6018_ENV) || defined(CONFIG_IPQ9048_ENV) #if defined(CONFIG_IPQ40XX_ENV) || defined(CONFIG_IPQ807X_ENV) || defined(CONFIG_IPQ806X_ENV) || defined(CONFIG_IPQ5018_ENV) || defined(CONFIG_IPQ6018_ENV) || defined(CONFIG_IPQ9574_ENV)
extern int (*saveenv)(void); extern int (*saveenv)(void);
#else #else
int saveenv (void); int saveenv (void);

20
include/configs/ipq9574.h
View file

@ -11,19 +11,19 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _IPQ9048_H #ifndef _IPQ9574_H
#define _IPQ9048_H #define _IPQ9574_H
#ifndef DO_DEPS_ONLY #ifndef DO_DEPS_ONLY
#include <generated/asm-offsets.h> #include <generated/asm-offsets.h>
#endif #endif
/* /*
* Support for IPQ9048 RUMI * Support for IPQ9574 RUMI
*/ */
#define CONFIG_IPQ9048_RUMI #define CONFIG_IPQ9574_RUMI
#define CONFIG_IPQ9048 #define CONFIG_IPQ9574
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT
@ -33,7 +33,7 @@
#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20)
#define CONFIG_IPQ9048_UART #define CONFIG_IPQ9574_UART
#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
@ -118,7 +118,7 @@ extern loff_t board_env_range;
extern loff_t board_env_size; extern loff_t board_env_size;
#endif #endif
#define CONFIG_IPQ9048_ENV 1 #define CONFIG_IPQ9574_ENV 1
#define CONFIG_ENV_OFFSET board_env_offset #define CONFIG_ENV_OFFSET board_env_offset
#define CONFIG_ENV_SIZE CONFIG_ENV_SIZE_MAX #define CONFIG_ENV_SIZE CONFIG_ENV_SIZE_MAX
#define CONFIG_ENV_RANGE board_env_range #define CONFIG_ENV_RANGE board_env_range
@ -136,8 +136,8 @@ extern loff_t board_env_size;
#define HAVE_BLOCK_DEVICE #define HAVE_BLOCK_DEVICE
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_IPQ9048_I2C 1 #define CONFIG_IPQ9574_I2C 1
#ifdef CONFIG_IPQ9048_I2C #ifdef CONFIG_IPQ9574_I2C
#define CONFIG_SYS_I2C_QUP #define CONFIG_SYS_I2C_QUP
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_DM_I2C #define CONFIG_DM_I2C
@ -318,4 +318,4 @@ extern loff_t board_env_size;
#define CONFIG_IPQ_TZT #define CONFIG_IPQ_TZT
#define CONFIG_IPQ_FDT_FIXUP #define CONFIG_IPQ_FDT_FIXUP
#define CONFIG_ARMV7_PSCI #define CONFIG_ARMV7_PSCI
#endif /* _IPQ9048_H */ #endif /* _IPQ9574_H */

4
include/dt-bindings/qcom/gpio-ipq9574.h
View file

@ -11,8 +11,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef __DT_BINDINGS_IPQ9048_GPIO_H__ #ifndef __DT_BINDINGS_IPQ9574_GPIO_H__
#define __DT_BINDINGS_IPQ9048_GPIO_H__ #define __DT_BINDINGS_IPQ9574_GPIO_H__
/* GPIO TLMM: Direction */ /* GPIO TLMM: Direction */
#define GPIO_INPUT 0 #define GPIO_INPUT 0