Merge tag 'rpi-next-2019.07' of https://github.com/mbgg/u-boot
- fix complation error for CONFIG_USB - update RPi3 DTBs to v5.1-rc6 state - add defconfig for RPi3 B+ - Fix BCM2835_MBOX_TAG_TEST_PIXEL_ORDER define
This commit is contained in:
Tom Rini
@@ -146,12 +146,38 @@
|
||||
"fdt_addr_r=0x02600000\0" \
|
||||
"ramdisk_addr_r=0x02700000\0"
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_MMC)
|
||||
#define BOOT_TARGET_MMC(func) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(MMC, mmc, 1)
|
||||
#else
|
||||
#define BOOT_TARGET_MMC(func)
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_USB)
|
||||
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
|
||||
#else
|
||||
#define BOOT_TARGET_USB(func)
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_PXE)
|
||||
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
|
||||
#else
|
||||
#define BOOT_TARGET_PXE(func)
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_DHCP)
|
||||
#define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
|
||||
#else
|
||||
#define BOOT_TARGET_DHCP(func)
|
||||
#endif
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(MMC, mmc, 1) \
|
||||
func(USB, usb, 0) \
|
||||
func(PXE, pxe, na) \
|
||||
func(DHCP, dhcp, na)
|
||||
BOOT_TARGET_MMC(func) \
|
||||
BOOT_TARGET_USB(func) \
|
||||
BOOT_TARGET_PXE(func) \
|
||||
BOOT_TARGET_DHCP(func)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
|
||||
@@ -1,14 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Copyright (C) 2015 Broadcom Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation version 2.
|
||||
*
|
||||
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
||||
* kind, whether express or implied; without even the implied warranty
|
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#define BCM2835_AUX_CLOCK_UART 0
|
||||
|
||||
@@ -1,14 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Copyright (C) 2015 Broadcom Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation version 2.
|
||||
*
|
||||
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
||||
* kind, whether express or implied; without even the implied warranty
|
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#define BCM2835_PLLA 0
|
||||
|
||||
21
include/dt-bindings/net/microchip-lan78xx.h
Normal file
21
include/dt-bindings/net/microchip-lan78xx.h
Normal file
@@ -0,0 +1,21 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef _DT_BINDINGS_MICROCHIP_LAN78XX_H
|
||||
#define _DT_BINDINGS_MICROCHIP_LAN78XX_H
|
||||
|
||||
/* LED modes for LAN7800/LAN7850 embedded PHY */
|
||||
|
||||
#define LAN78XX_LINK_ACTIVITY 0
|
||||
#define LAN78XX_LINK_1000_ACTIVITY 1
|
||||
#define LAN78XX_LINK_100_ACTIVITY 2
|
||||
#define LAN78XX_LINK_10_ACTIVITY 3
|
||||
#define LAN78XX_LINK_100_1000_ACTIVITY 4
|
||||
#define LAN78XX_LINK_10_1000_ACTIVITY 5
|
||||
#define LAN78XX_LINK_10_100_ACTIVITY 6
|
||||
#define LAN78XX_DUPLEX_COLLISION 8
|
||||
#define LAN78XX_COLLISION 9
|
||||
#define LAN78XX_ACTIVITY 10
|
||||
#define LAN78XX_AUTONEG_FAULT 12
|
||||
#define LAN78XX_FORCE_LED_OFF 14
|
||||
#define LAN78XX_FORCE_LED_ON 15
|
||||
|
||||
#endif
|
||||
@@ -1,14 +1,8 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Header providing constants for bcm2835 pinctrl bindings.
|
||||
*
|
||||
* Copyright (C) 2015 Stefan Wahren <stefan.wahren@i2se.com>
|
||||
*
|
||||
* The code contained herein is licensed under the GNU General Public
|
||||
* License. You may obtain a copy of the GNU General Public License
|
||||
* Version 2 at the following locations:
|
||||
*
|
||||
* http://www.opensource.org/licenses/gpl-license.html
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*/
|
||||
|
||||
#ifndef __DT_BINDINGS_PINCTRL_BCM2835_H__
|
||||
|
||||
28
include/dt-bindings/soc/bcm2835-pm.h
Normal file
28
include/dt-bindings/soc/bcm2835-pm.h
Normal file
@@ -0,0 +1,28 @@
|
||||
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
|
||||
|
||||
#ifndef _DT_BINDINGS_ARM_BCM2835_PM_H
|
||||
#define _DT_BINDINGS_ARM_BCM2835_PM_H
|
||||
|
||||
#define BCM2835_POWER_DOMAIN_GRAFX 0
|
||||
#define BCM2835_POWER_DOMAIN_GRAFX_V3D 1
|
||||
#define BCM2835_POWER_DOMAIN_IMAGE 2
|
||||
#define BCM2835_POWER_DOMAIN_IMAGE_PERI 3
|
||||
#define BCM2835_POWER_DOMAIN_IMAGE_ISP 4
|
||||
#define BCM2835_POWER_DOMAIN_IMAGE_H264 5
|
||||
#define BCM2835_POWER_DOMAIN_USB 6
|
||||
#define BCM2835_POWER_DOMAIN_DSI0 7
|
||||
#define BCM2835_POWER_DOMAIN_DSI1 8
|
||||
#define BCM2835_POWER_DOMAIN_CAM0 9
|
||||
#define BCM2835_POWER_DOMAIN_CAM1 10
|
||||
#define BCM2835_POWER_DOMAIN_CCP2TX 11
|
||||
#define BCM2835_POWER_DOMAIN_HDMI 12
|
||||
|
||||
#define BCM2835_POWER_DOMAIN_COUNT 13
|
||||
|
||||
#define BCM2835_RESET_V3D 0
|
||||
#define BCM2835_RESET_ISP 1
|
||||
#define BCM2835_RESET_H264 2
|
||||
|
||||
#define BCM2835_RESET_COUNT 3
|
||||
|
||||
#endif /* _DT_BINDINGS_ARM_BCM2835_PM_H */
|
||||
Reference in New Issue
Block a user