mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Merge git://git.denx.de/u-boot-marvell
- Clearfog GT-8K support added by Baruch / Raheeb - const and sizes cleanup (also in MIPS) from Baruch - Minor cleanup to db-88f6820 from Chris
This commit is contained in:
commit
a3e1653dde
14 changed files with 466 additions and 31 deletions
|
@ -100,6 +100,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
|
|||
armada-7040-db-nand.dtb \
|
||||
armada-8040-db.dtb \
|
||||
armada-8040-mcbin.dtb \
|
||||
armada-8040-clearfog-gt-8k.dtb \
|
||||
armada-xp-gp.dtb \
|
||||
armada-xp-maxbcm.dtb \
|
||||
armada-xp-synology-ds414.dtb \
|
||||
|
|
315
arch/arm/dts/armada-8040-clearfog-gt-8k.dts
Normal file
315
arch/arm/dts/armada-8040-clearfog-gt-8k.dts
Normal file
|
@ -0,0 +1,315 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Copyright (C) 2018 SolidRun ltd
|
||||
*/
|
||||
|
||||
#include "armada-8040.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ClearFog-GT-8K";
|
||||
compatible = "solidrun,clearfog-gt-8k",
|
||||
"marvell,armada8040";
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial0:115200n8";
|
||||
};
|
||||
|
||||
aliases {
|
||||
i2c0 = &cpm_i2c0;
|
||||
i2c1 = &cpm_i2c1;
|
||||
spi0 = &cps_spi1;
|
||||
};
|
||||
|
||||
memory@00000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x0 0x0 0x0 0x80000000>;
|
||||
};
|
||||
|
||||
simple-bus {
|
||||
compatible = "simple-bus";
|
||||
|
||||
reg_usb3h0_vbus: usb3-vbus0 {
|
||||
compatible = "regulator-fixed";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cpm_xhci_vbus_pins>;
|
||||
regulator-name = "reg-usb3h0-vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
startup-delay-us = <300000>;
|
||||
shutdown-delay-us = <500000>;
|
||||
regulator-force-boot-off;
|
||||
gpio = <&cpm_gpio1 15 GPIO_ACTIVE_LOW>; /* GPIO[47] */
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&uart0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&ap_pinctl {
|
||||
/*
|
||||
* MPP Bus:
|
||||
* eMMC [0-10]
|
||||
* UART0 [11,19]
|
||||
*/
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
pin-func = < 1 1 1 1 1 1 1 1 1 1
|
||||
1 3 0 0 0 0 0 0 0 3 >;
|
||||
};
|
||||
|
||||
/* on-board eMMC */
|
||||
&ap_sdhci0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ap_emmc_pins>;
|
||||
bus-width = <8>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_pinctl {
|
||||
/*
|
||||
* MPP Bus:
|
||||
* [0-31] = 0xff: Keep default CP0_shared_pins:
|
||||
* [11] CLKOUT_MPP_11 (out)
|
||||
* [23] LINK_RD_IN_CP2CP (in)
|
||||
* [25] CLKOUT_MPP_25 (out)
|
||||
* [29] AVS_FB_IN_CP2CP (in)
|
||||
* [32, 33, 34] pci0/1/2 reset
|
||||
* [35-38] CP0 I2C1 and I2C0
|
||||
* [39] GPIO reset button
|
||||
* [40,41] LED0 and LED1
|
||||
* [43] 1512 phy reset
|
||||
* [47] USB VBUS EN (active low)
|
||||
* [48] FAN PWM
|
||||
* [49] SFP+ present signal
|
||||
* [50] TPM interrupt
|
||||
* [51] WLAN0 disable
|
||||
* [52] WLAN1 disable
|
||||
* [53] LTE disable
|
||||
* [54] NFC reset
|
||||
* [55] Micro SD card detect
|
||||
* [56-61] Micro SD
|
||||
*/
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0 0 0 0 2 2 2 2 0
|
||||
0 0 0 0 0 0 0 0 0 0
|
||||
0 0 0 0 0 0 0xe 0xe 0xe 0xe
|
||||
0xe 0xe 0 >;
|
||||
|
||||
cpm_xhci_vbus_pins: cpm-xhci-vbus-pins {
|
||||
marvell,pins = < 47 >;
|
||||
marvell,function = <0>;
|
||||
};
|
||||
|
||||
cps_1g_phy_reset: cps-1g-phy-reset {
|
||||
marvell,pins = < 43 >;
|
||||
marvell,function = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
/* uSD slot */
|
||||
&cpm_sdhci0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cpm_sdhci_pins>;
|
||||
bus-width = <4>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_pcie0 {
|
||||
num-lanes = <1>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_i2c0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cpm_i2c0_pins>;
|
||||
status = "okay";
|
||||
clock-frequency = <100000>;
|
||||
};
|
||||
|
||||
&cpm_i2c1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cpm_i2c1_pins>;
|
||||
status = "okay";
|
||||
clock-frequency = <100000>;
|
||||
};
|
||||
|
||||
&cpm_sata0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_comphy {
|
||||
/*
|
||||
* CP0 Serdes Configuration:
|
||||
* Lane 0: PCIe0 (x1)
|
||||
* Lane 1: Not connected
|
||||
* Lane 2: SFI (10G)
|
||||
* Lane 3: Not connected
|
||||
* Lane 4: USB 3.0 host port1 (can be PCIe)
|
||||
* Lane 5: Not connected
|
||||
*/
|
||||
phy0 {
|
||||
phy-type = <PHY_TYPE_PEX0>;
|
||||
};
|
||||
phy1 {
|
||||
phy-type = <PHY_TYPE_UNCONNECTED>;
|
||||
};
|
||||
phy2 {
|
||||
phy-type = <PHY_TYPE_SFI>;
|
||||
};
|
||||
phy3 {
|
||||
phy-type = <PHY_TYPE_UNCONNECTED>;
|
||||
};
|
||||
phy4 {
|
||||
phy-type = <PHY_TYPE_USB3_HOST1>;
|
||||
};
|
||||
phy5 {
|
||||
phy-type = <PHY_TYPE_UNCONNECTED>;
|
||||
};
|
||||
};
|
||||
|
||||
&cpm_ethernet {
|
||||
pinctrl-names = "default";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/* 10G SFI SFP */
|
||||
&cpm_eth0 {
|
||||
status = "okay";
|
||||
phy-mode = "sfi";
|
||||
};
|
||||
|
||||
&cps_sata0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_usb3_0 {
|
||||
vbus-supply = <®_usb3h0_vbus>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_utmi0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_pinctl {
|
||||
/*
|
||||
* MPP Bus:
|
||||
* [0-5] TDM
|
||||
* [6] VHV Enable
|
||||
* [7] CP1 SPI0 CSn1 (FXS)
|
||||
* [8] CP1 SPI0 CSn0 (TPM)
|
||||
* [9.11]CP1 SPI0 MOSI/MISO/CLK
|
||||
* [13] CP1 SPI1 MISO (TDM and SPI ROM shared)
|
||||
* [14] CP1 SPI1 CS0n (64Mb SPI ROM)
|
||||
* [15] CP1 SPI1 MOSI (TDM and SPI ROM shared)
|
||||
* [16] CP1 SPI1 CLK (TDM and SPI ROM shared)
|
||||
* [24] Topaz switch reset
|
||||
* [26] Buzzer
|
||||
* [27] CP1 SMI MDIO
|
||||
* [28] CP1 SMI MDC
|
||||
* [29] CP0 10G SFP TX Disable
|
||||
* [30] WPS button
|
||||
* [31] Front panel button
|
||||
* [32-62] = 0xff: Keep default CP1_shared_pins:
|
||||
*/
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
pin-func = < 0x4 0x4 0x4 0x4 0x4 0x4 0x0 0x4 0x4 0x4
|
||||
0x4 0x4 0x0 0x3 0x3 0x3 0x3 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0x0 0xff 0x0 0x8 0x8 0x0
|
||||
0x0 0x0 0x0 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff>;
|
||||
};
|
||||
|
||||
&cps_spi1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cps_spi1_pins>;
|
||||
status = "okay";
|
||||
|
||||
spi-flash@0 {
|
||||
compatible = "jedec,spi-nor", "spi-flash";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <10000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
label = "U-Boot";
|
||||
reg = <0 0x200000>;
|
||||
};
|
||||
partition@200000 {
|
||||
label = "Filesystem";
|
||||
reg = <0x200000 0xce0000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&cps_comphy {
|
||||
/*
|
||||
* CP1 Serdes Configuration:
|
||||
* Lane 0: SATA 1 (RX swapped). Can be PCIe0
|
||||
* Lane 1: Not used
|
||||
* Lane 2: USB HOST 0
|
||||
* Lane 3: SGMII1 - Connected to 1512 port
|
||||
* Lane 4: Not used
|
||||
* Lane 5: SGMII2 - Connected to Topaz switch
|
||||
*/
|
||||
phy0 {
|
||||
phy-type = <PHY_TYPE_SATA1>;
|
||||
phy-invert = <PHY_POLARITY_RXD_INVERT>;
|
||||
};
|
||||
phy1 {
|
||||
phy-type = <PHY_TYPE_UNCONNECTED>;
|
||||
};
|
||||
phy2 {
|
||||
phy-type = <PHY_TYPE_USB3_HOST0>;
|
||||
};
|
||||
phy3 {
|
||||
phy-type = <PHY_TYPE_SGMII1>;
|
||||
phy-speed = <PHY_SPEED_1_25G>;
|
||||
};
|
||||
phy4 {
|
||||
phy-type = <PHY_TYPE_UNCONNECTED>;
|
||||
};
|
||||
phy5 {
|
||||
phy-type = <PHY_TYPE_SGMII2>;
|
||||
phy-speed = <PHY_SPEED_3_125G>;
|
||||
};
|
||||
};
|
||||
|
||||
&cps_mdio {
|
||||
phy0: ethernet-phy@0 {
|
||||
reg = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
&cps_ethernet {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cps_1g_phy_reset>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/* 1G SGMII */
|
||||
&cps_eth1 {
|
||||
status = "okay";
|
||||
phy-mode = "sgmii";
|
||||
phy = <&phy0>;
|
||||
phy-reset-gpios = <&cpm_gpio1 11 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
/* 2.5G to Topaz switch */
|
||||
&cps_eth2 {
|
||||
status = "okay";
|
||||
phy-mode = "sgmii";
|
||||
phy-speed = <2500>;
|
||||
phy-reset-gpios = <&cps_gpio0 24 GPIO_ACTIVE_LOW>;
|
||||
};
|
|
@ -7,6 +7,8 @@
|
|||
#ifndef _ASM_ARMV8_MMU_H_
|
||||
#define _ASM_ARMV8_MMU_H_
|
||||
|
||||
#include <linux/const.h>
|
||||
|
||||
/*
|
||||
* block/section address mask and size definitions.
|
||||
*/
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include <dm.h>
|
||||
#include <fdtdec.h>
|
||||
#include <linux/libfdt.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <pci.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
@ -45,15 +46,62 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void)
|
|||
|
||||
/* DRAM init code ... */
|
||||
|
||||
#define MV_SIP_DRAM_SIZE 0x82000010
|
||||
|
||||
static u64 a8k_dram_scan_ap_sz(void)
|
||||
{
|
||||
struct pt_regs pregs;
|
||||
|
||||
pregs.regs[0] = MV_SIP_DRAM_SIZE;
|
||||
pregs.regs[1] = SOC_REGS_PHY_BASE;
|
||||
smc_call(&pregs);
|
||||
|
||||
return pregs.regs[0];
|
||||
}
|
||||
|
||||
static void a8k_dram_init_banksize(void)
|
||||
{
|
||||
/*
|
||||
* The firmware (ATF) leaves a 1G whole above the 3G mark for IO
|
||||
* devices. Higher RAM is mapped at 4G.
|
||||
*
|
||||
* Config 2 DRAM banks:
|
||||
* Bank 0 - max size 4G - 1G
|
||||
* Bank 1 - ram size - 4G + 1G
|
||||
*/
|
||||
phys_size_t max_bank0_size = SZ_4G - SZ_1G;
|
||||
|
||||
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
|
||||
if (gd->ram_size <= max_bank0_size) {
|
||||
gd->bd->bi_dram[0].size = gd->ram_size;
|
||||
return;
|
||||
}
|
||||
|
||||
gd->bd->bi_dram[0].size = max_bank0_size;
|
||||
if (CONFIG_NR_DRAM_BANKS > 1) {
|
||||
gd->bd->bi_dram[1].start = SZ_4G;
|
||||
gd->bd->bi_dram[1].size = gd->ram_size - max_bank0_size;
|
||||
}
|
||||
}
|
||||
|
||||
int dram_init_banksize(void)
|
||||
{
|
||||
fdtdec_setup_memory_banksize();
|
||||
if (CONFIG_IS_ENABLED(ARMADA_8K))
|
||||
a8k_dram_init_banksize();
|
||||
else
|
||||
fdtdec_setup_memory_banksize();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
if (CONFIG_IS_ENABLED(ARMADA_8K)) {
|
||||
gd->ram_size = a8k_dram_scan_ap_sz();
|
||||
if (gd->ram_size != 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (fdtdec_setup_mem_size_base() != 0)
|
||||
return -EINVAL;
|
||||
|
||||
|
|
|
@ -6,11 +6,10 @@
|
|||
#include <common.h>
|
||||
#include <fdt_support.h>
|
||||
#include <fdtdec.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <asm/arch/tegra.h>
|
||||
#include <asm/armv8/mmu.h>
|
||||
|
||||
#define SZ_4G 0x100000000ULL
|
||||
|
||||
/*
|
||||
* Size of a region that's large enough to hold the relocated U-Boot and all
|
||||
* other allocations made around it (stack, heap, page tables, etc.)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef _ASM_MACH_GENERIC_SPACES_H
|
||||
#define _ASM_MACH_GENERIC_SPACES_H
|
||||
|
||||
#include <asm/const.h>
|
||||
#include <linux/const.h>
|
||||
|
||||
/*
|
||||
* This gives the physical RAM offset.
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
#ifndef _ASM_RISCV_CSR_H
|
||||
#define _ASM_RISCV_CSR_H
|
||||
|
||||
#include <linux/const.h>
|
||||
|
||||
/* Status register flags */
|
||||
#define SR_SIE _AC(0x00000002, UL) /* Supervisor Interrupt Enable */
|
||||
#define SR_SPIE _AC(0x00000020, UL) /* Previous Supervisor IE */
|
||||
|
|
|
@ -4,3 +4,4 @@ S: Maintained
|
|||
F: board/soldrun/clearfog/
|
||||
F: include/configs/clearfog.h
|
||||
F: configs/clearfog_defconfig
|
||||
F: configs/clearfog_gt_8k_defconfig
|
||||
|
|
75
configs/clearfog_gt_8k_defconfig
Normal file
75
configs/clearfog_gt_8k_defconfig
Normal file
|
@ -0,0 +1,75 @@
|
|||
CONFIG_ARM=y
|
||||
CONFIG_ARCH_MVEBU=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00000000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||||
CONFIG_TARGET_MVEBU_ARMADA_8K=y
|
||||
CONFIG_DEBUG_UART_BASE=0xf0512000
|
||||
CONFIG_DEBUG_UART_CLOCK=200000000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="armada-8040-clearfog-gt-8k"
|
||||
CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_ARCH_EARLY_INIT_R=y
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_PCI=y
|
||||
CONFIG_CMD_SF=y
|
||||
CONFIG_CMD_SPI=y
|
||||
CONFIG_CMD_USB=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_TFTPPUT=y
|
||||
CONFIG_CMD_CACHE=y
|
||||
CONFIG_CMD_TIME=y
|
||||
CONFIG_CMD_MVEBU_BUBT=y
|
||||
CONFIG_CMD_REGULATOR=y
|
||||
CONFIG_CMD_EXT4_WRITE=y
|
||||
CONFIG_MAC_PARTITION=y
|
||||
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
||||
CONFIG_AHCI_MVEBU=y
|
||||
CONFIG_DM_GPIO=y
|
||||
CONFIG_DM_I2C=y
|
||||
CONFIG_SYS_I2C_MVTWSI=y
|
||||
CONFIG_MISC=y
|
||||
CONFIG_DM_MMC=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
CONFIG_MMC_SDHCI_XENON=y
|
||||
CONFIG_SPI_FLASH=y
|
||||
CONFIG_SPI_FLASH_MACRONIX=y
|
||||
CONFIG_SPI_FLASH_SPANSION=y
|
||||
CONFIG_SPI_FLASH_STMICRO=y
|
||||
CONFIG_SPI_FLASH_WINBOND=y
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PHY_GIGE=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DM_PCI=y
|
||||
CONFIG_PCIE_DW_MVEBU=y
|
||||
CONFIG_MVEBU_COMPHY_SUPPORT=y
|
||||
CONFIG_PINCTRL=y
|
||||
CONFIG_PINCTRL_ARMADA_8K=y
|
||||
CONFIG_DM_REGULATOR_FIXED=y
|
||||
# CONFIG_SPL_SERIAL_PRESENT is not set
|
||||
CONFIG_DEBUG_UART_SHIFT=2
|
||||
CONFIG_DEBUG_UART_ANNOUNCE=y
|
||||
CONFIG_SYS_NS16550=y
|
||||
CONFIG_KIRKWOOD_SPI=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_DM_USB=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_HOST_ETHER=y
|
||||
CONFIG_USB_ETHER_ASIX=y
|
||||
CONFIG_USB_ETHER_MCS7830=y
|
||||
CONFIG_USB_ETHER_RTL8152=y
|
||||
CONFIG_USB_ETHER_SMSC95XX=y
|
||||
CONFIG_SMBIOS_MANUFACTURER=""
|
|
@ -14,9 +14,6 @@ typedef volatile unsigned long vu_long;
|
|||
typedef volatile unsigned short vu_short;
|
||||
typedef volatile unsigned char vu_char;
|
||||
|
||||
/* Allow sharing constants with type modifiers between C and assembly. */
|
||||
#define _AC(X, Y) (X##Y)
|
||||
|
||||
#include <config.h>
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
|
@ -541,16 +538,10 @@ int cpu_release(u32 nr, int argc, char * const argv[]);
|
|||
|
||||
#else /* __ASSEMBLY__ */
|
||||
|
||||
/* Drop a C type modifier (like in 3UL) for constants used in assembly. */
|
||||
#define _AC(X, Y) X
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
/* Put only stuff here that the assembler can digest */
|
||||
|
||||
/* Declare an unsigned long constant digestable both by C and an assembler. */
|
||||
#define UL(x) _AC(x, UL)
|
||||
|
||||
#ifdef CONFIG_POST
|
||||
#define CONFIG_HAS_POST
|
||||
#ifndef CONFIG_POST_ALT_LIST
|
||||
|
|
|
@ -10,11 +10,6 @@
|
|||
* High Level Configuration Options (easy to change)
|
||||
*/
|
||||
|
||||
/*
|
||||
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
|
||||
* for DDR ECC byte filling in the SPL before loading the main
|
||||
* U-Boot into it.
|
||||
*/
|
||||
#define CONFIG_SYS_TCLK 200000000 /* 200MHz */
|
||||
|
||||
/*
|
||||
|
|
|
@ -10,11 +10,6 @@
|
|||
* High Level Configuration Options (easy to change)
|
||||
*/
|
||||
|
||||
/*
|
||||
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed
|
||||
* for DDR ECC byte filling in the SPL before loading the main
|
||||
* U-Boot into it.
|
||||
*/
|
||||
#define CONFIG_SYS_TCLK 250000000 /* 250MHz */
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* const.h: Macros for dealing with constants.
|
||||
*/
|
||||
|
||||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
#ifndef _LINUX_CONST_H
|
||||
#define _LINUX_CONST_H
|
||||
|
||||
/* const.h: Macros for dealing with constants. */
|
||||
|
||||
/* Some constant macros are used in both assembler and
|
||||
* C code. Therefore we cannot annotate them always with
|
||||
* 'UL' and other type specifiers unilaterally. We
|
||||
|
@ -16,12 +14,21 @@
|
|||
*/
|
||||
|
||||
#ifdef __ASSEMBLY__
|
||||
#define _AC(X,Y) X
|
||||
#define _AT(T,X) X
|
||||
#else
|
||||
#define __AC(X,Y) (X##Y)
|
||||
#define _AC(X,Y) __AC(X,Y)
|
||||
#define _AT(T,X) ((T)(X))
|
||||
#endif
|
||||
|
||||
#define _BITUL(x) (_AC(1,UL) << (x))
|
||||
#define _BITULL(x) (_AC(1,ULL) << (x))
|
||||
#define _UL(x) (_AC(x, UL))
|
||||
#define _ULL(x) (_AC(x, ULL))
|
||||
|
||||
#endif /* !(_LINUX_CONST_H) */
|
||||
#define _BITUL(x) (_UL(1) << (x))
|
||||
#define _BITULL(x) (_ULL(1) << (x))
|
||||
|
||||
#define UL(x) (_UL(x))
|
||||
#define ULL(x) (_ULL(x))
|
||||
|
||||
#endif /* _LINUX_CONST_H */
|
|
@ -8,6 +8,8 @@
|
|||
#ifndef __LINUX_SIZES_H__
|
||||
#define __LINUX_SIZES_H__
|
||||
|
||||
#include <linux/const.h>
|
||||
|
||||
#define SZ_1 0x00000001
|
||||
#define SZ_2 0x00000002
|
||||
#define SZ_4 0x00000004
|
||||
|
@ -44,4 +46,6 @@
|
|||
#define SZ_1G 0x40000000
|
||||
#define SZ_2G 0x80000000
|
||||
|
||||
#define SZ_4G _AC(0x100000000, ULL)
|
||||
|
||||
#endif /* __LINUX_SIZES_H__ */
|
||||
|
|
Loading…
Add table
Reference in a new issue