GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-17 12:41:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-mips

Browse source
This commit is contained in:
Tom Rini 2017-05-13 16:45:35 -04:00
commit 22f3368e71
14 changed files with 61 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
arch/mips/Kconfig
View file

@ -97,6 +97,7 @@ config TARGET_BOSTON
select MIPS_CM
select MIPS_L1_CACHE_SHIFT_6
select MIPS_L2_CACHE
select OF_BOARD_SETUP
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_LITTLE_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
@ -221,6 +222,17 @@ config ROM_EXCEPTION_VECTORS
Disable this, if the U-Boot image is booted from DRAM (e.g. by SPL).
In that case the image size will be reduced by 0x500 bytes.
config MIPS_CM_BASE
hex "MIPS CM GCR Base Address"
depends on MIPS_CM
default 0x16100000 if TARGET_BOSTON
default 0x1fbf8000
help
The physical base address at which to map the MIPS Coherence Manager
Global Configuration Registers (GCRs). This should be set such that
the GCRs occupy a region of the physical address space which is
otherwise unused, or at minimum that software doesn't need to access.
endmenu
menu "OS boot interface"
@ -393,15 +405,6 @@ config MIPS_CM
wish U-Boot to configure it or make use of it to retrieve system
information such as cache configuration.
config MIPS_CM_BASE
hex
default 0x1fbf8000
help
The physical base address at which to map the MIPS Coherence Manager
Global Configuration Registers (GCRs). This should be set such that
the GCRs occupy a region of the physical address space which is
otherwise unused, or at minimum that software doesn't need to access.
endif
endmenu

2
arch/mips/dts/brcm,bcm63268.dtsi
View file

@ -136,7 +136,7 @@
memory-controller@10003000 {
compatible = "brcm,bcm6328-mc";
reg = <0x10003000 0x1000>;
reg = <0x10003000 0x894>;
u-boot,dm-pre-reloc;
};
};

2
arch/mips/dts/brcm,bcm6328.dtsi
View file

@ -120,7 +120,7 @@
memory-controller@10003000 {
compatible = "brcm,bcm6328-mc";
reg = <0x10003000 0x1000>;
reg = <0x10003000 0x864>;
u-boot,dm-pre-reloc;
};
};

2
arch/mips/dts/brcm,bcm6358.dtsi
View file

@ -133,7 +133,7 @@
memory-controller@fffe1200 {
compatible = "brcm,bcm6358-mc";
reg = <0xfffe1200 0x1000>;
reg = <0xfffe1200 0x4c>;
u-boot,dm-pre-reloc;
};
};

2
arch/mips/lib/cache.c
View file

@ -7,7 +7,9 @@
#include <common.h>
#include <asm/cacheops.h>
#ifdef CONFIG_MIPS_L2_CACHE
#include <asm/cm.h>
#endif
#include <asm/mipsregs.h>
DECLARE_GLOBAL_DATA_PTR;

6
arch/mips/mach-bmips/Kconfig
View file

@ -63,6 +63,11 @@ config BOARD_HUAWEI_HG556A
depends on SOC_BMIPS_BCM6358
select BMIPS_SUPPORTS_BOOT_RAM
config BOARD_SFR_NB4_SER
bool "SFR NeufBox 4 (Sercomm)"
depends on SOC_BMIPS_BCM6358
select BMIPS_SUPPORTS_BOOT_RAM
endchoice
choice
@ -84,5 +89,6 @@ config BMIPS_SUPPORTS_BOOT_RAM
source "board/comtrend/ar5387un/Kconfig"
source "board/comtrend/vr3032u/Kconfig"
source "board/huawei/hg556a/Kconfig"
source "board/sfr/nb4_ser/Kconfig"
endmenu

1
board/imgtec/boston/Makefile
View file

@ -6,4 +6,5 @@
obj-y += checkboard.o
obj-y += ddr.o
obj-y += dt.o
obj-y += lowlevel_init.o

27
board/imgtec/boston/dt.c Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (C) 2016 Imagination Technologies
*
* SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
#include <fdt_support.h>
int ft_board_setup(void *blob, bd_t *bd)
{
DECLARE_GLOBAL_DATA_PTR;
u64 mem_start[2], mem_size[2];
int mem_regions;
mem_start[0] = 0;
mem_size[0] = min_t(u64, 256llu << 20, gd->ram_size);
mem_regions = 1;
if (gd->ram_size > mem_size[0]) {
mem_start[1] = 0x80000000 + mem_size[0];
mem_size[1] = gd->ram_size - mem_size[0];
mem_regions++;
}
return fdt_fixup_memory_banks(blob, mem_start, mem_size, mem_regions);
}

7
configs/boston32r2_defconfig
View file

@ -4,11 +4,11 @@ CONFIG_TARGET_BOSTON=y
# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
CONFIG_MIPS_BOOT_FDT=y
CONFIG_DEFAULT_DEVICE_TREE="img,boston"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_BEST_MATCH=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="boston # "
# CONFIG_CMD_ELF is not set
# CONFIG_CMD_IMLS is not set
@ -17,16 +17,11 @@ CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_DNS=y
CONFIG_CMD_LINK_LOCAL=y
CONFIG_CMD_TIME=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
# CONFIG_DOS_PARTITION is not set
# CONFIG_ISO_PARTITION is not set
CONFIG_OF_EMBED=y

7
configs/boston32r2el_defconfig
View file

@ -5,11 +5,11 @@ CONFIG_SYS_LITTLE_ENDIAN=y
# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
CONFIG_MIPS_BOOT_FDT=y
CONFIG_DEFAULT_DEVICE_TREE="img,boston"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_BEST_MATCH=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="boston # "
# CONFIG_CMD_ELF is not set
# CONFIG_CMD_IMLS is not set
@ -18,16 +18,11 @@ CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_DNS=y
CONFIG_CMD_LINK_LOCAL=y
CONFIG_CMD_TIME=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
# CONFIG_DOS_PARTITION is not set
# CONFIG_ISO_PARTITION is not set
CONFIG_OF_EMBED=y

7
configs/boston64r2_defconfig
View file

@ -5,11 +5,11 @@ CONFIG_CPU_MIPS64_R2=y
# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
CONFIG_MIPS_BOOT_FDT=y
CONFIG_DEFAULT_DEVICE_TREE="img,boston"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_BEST_MATCH=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="boston # "
# CONFIG_CMD_ELF is not set
# CONFIG_CMD_IMLS is not set
@ -18,16 +18,11 @@ CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_DNS=y
CONFIG_CMD_LINK_LOCAL=y
CONFIG_CMD_TIME=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
# CONFIG_DOS_PARTITION is not set
# CONFIG_ISO_PARTITION is not set
CONFIG_OF_EMBED=y

7
configs/boston64r2el_defconfig
View file

@ -6,11 +6,11 @@ CONFIG_CPU_MIPS64_R2=y
# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
CONFIG_MIPS_BOOT_FDT=y
CONFIG_DEFAULT_DEVICE_TREE="img,boston"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_BEST_MATCH=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="boston # "
# CONFIG_CMD_ELF is not set
# CONFIG_CMD_IMLS is not set
@ -19,16 +19,11 @@ CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_DNS=y
CONFIG_CMD_LINK_LOCAL=y
CONFIG_CMD_TIME=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
# CONFIG_DOS_PARTITION is not set
# CONFIG_ISO_PARTITION is not set
CONFIG_OF_EMBED=y

6
drivers/ram/bmips_ram.c
View file

@ -90,11 +90,7 @@ static const struct udevice_id bmips_ram_ids[] = {
}, {
.compatible = "brcm,bcm6358-mc",
.data = (ulong)&bmips_ram_bcm6358,
}, {
.compatible = "brcm,bcm63268-mc",
.data = (ulong)&bmips_ram_bcm6328,
},
{ /* sentinel */ }
}, { /* sentinel */ }
};
static int bmips_ram_probe(struct udevice *dev)

5
include/configs/boston.h
View file

@ -7,6 +7,11 @@
#ifndef __CONFIGS_BOSTON_H__
#define __CONFIGS_BOSTON_H__
/*
* General board configuration
*/
#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024)
/*
* CPU
*/