2017.09 RC1, Initial patch rebase
This commit is contained in:
Peter Robinson
parent
b04c8fbb19
commit
fb6a34924d
File diff suppressed because it is too large
Load Diff
@ -1,109 +0,0 @@
|
||||
From 68b78517e76a87445147dc76b774d3995d825933 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Glass <sjg@chromium.org>
|
||||
Date: Wed, 31 May 2017 17:57:10 -0600
|
||||
Subject: [PATCH 13/16] Allow displaying the U-Boot banner on a video display
|
||||
|
||||
At present the U-Boot banner is only displayed on the serial console. If
|
||||
this is not visible to the user, the banner does not show. Some devices
|
||||
have a video display which can usefully display this information.
|
||||
|
||||
Add a banner which is printed after relocation only on non-serial devices
|
||||
if CONFIG_DISPLAY_BOARDINFO_LATE is defined.
|
||||
|
||||
Signed-off-by: Simon Glass <sjg@chromium.org>
|
||||
---
|
||||
common/board_r.c | 1 +
|
||||
common/console.c | 15 +++++++++++----
|
||||
include/console.h | 12 ++++++++++++
|
||||
3 files changed, 24 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/common/board_r.c b/common/board_r.c
|
||||
index d69a33c4a3..20d412293a 100644
|
||||
--- a/common/board_r.c
|
||||
+++ b/common/board_r.c
|
||||
@@ -844,6 +844,7 @@ static init_fnc_t init_sequence_r[] = {
|
||||
#endif
|
||||
console_init_r, /* fully init console as a device */
|
||||
#ifdef CONFIG_DISPLAY_BOARDINFO_LATE
|
||||
+ console_announce_r,
|
||||
show_board_info,
|
||||
#endif
|
||||
#ifdef CONFIG_ARCH_MISC_INIT
|
||||
diff --git a/common/console.c b/common/console.c
|
||||
index 1232808df5..3fcd7ce66b 100644
|
||||
--- a/common/console.c
|
||||
+++ b/common/console.c
|
||||
@@ -202,7 +202,6 @@ static void console_putc(int file, const char c)
|
||||
}
|
||||
}
|
||||
|
||||
-#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
|
||||
static void console_puts_noserial(int file, const char *s)
|
||||
{
|
||||
int i;
|
||||
@@ -214,7 +213,6 @@ static void console_puts_noserial(int file, const char *s)
|
||||
dev->puts(dev, s);
|
||||
}
|
||||
}
|
||||
-#endif
|
||||
|
||||
static void console_puts(int file, const char *s)
|
||||
{
|
||||
@@ -248,13 +246,11 @@ static inline void console_putc(int file, const char c)
|
||||
stdio_devices[file]->putc(stdio_devices[file], c);
|
||||
}
|
||||
|
||||
-#if CONFIG_IS_ENABLED(PRE_CONSOLE_BUFFER)
|
||||
static inline void console_puts_noserial(int file, const char *s)
|
||||
{
|
||||
if (strcmp(stdio_devices[file]->name, "serial") != 0)
|
||||
stdio_devices[file]->puts(stdio_devices[file], s);
|
||||
}
|
||||
-#endif
|
||||
|
||||
static inline void console_puts(int file, const char *s)
|
||||
{
|
||||
@@ -699,6 +695,17 @@ static void console_update_silent(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
+int console_announce_r(void)
|
||||
+{
|
||||
+ char buf[DISPLAY_OPTIONS_BANNER_LENGTH];
|
||||
+
|
||||
+ display_options_get_banner(false, buf, sizeof(buf));
|
||||
+
|
||||
+ console_puts_noserial(stdout, buf);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
/* Called before relocation - use serial functions */
|
||||
int console_init_f(void)
|
||||
{
|
||||
diff --git a/include/console.h b/include/console.h
|
||||
index 3d37f6a53b..511b38e9e7 100644
|
||||
--- a/include/console.h
|
||||
+++ b/include/console.h
|
||||
@@ -42,6 +42,18 @@ void console_record_reset(void);
|
||||
*/
|
||||
void console_record_reset_enable(void);
|
||||
|
||||
+/**
|
||||
+ * console_announce_r() - print a U-Boot console on non-serial consoles
|
||||
+ *
|
||||
+ * When U-Boot starts up with a display it generally does not account itself
|
||||
+ * on the display. The banner is emitted on the UART before relocation instead.
|
||||
+ * This function prints a banner on devices which (we assume) did not receive
|
||||
+ * it before relocation.
|
||||
+ *
|
||||
+ * @return 0 (meaning no errors)
|
||||
+ */
|
||||
+int console_announce_r(void);
|
||||
+
|
||||
/*
|
||||
* CONSOLE multiplexing.
|
||||
*/
|
||||
--
|
||||
2.13.0
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From ee16d90048ee985df6199c987e64daeac3378777 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 4 Mar 2017 14:26:19 +0000
|
||||
Subject: [PATCH] v2 mx6cuboxi: Add support for sata
|
||||
|
||||
The Cubox-i and Hummingboard series of devices have an option of
|
||||
SATA on board, and depending on how the fuses are blown even the
|
||||
option to boot SPL from SATA. So enable support for it so it can
|
||||
be used to boot the OS from if people desire.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
board/solidrun/mx6cuboxi/mx6cuboxi.c | 7 +++++++
|
||||
include/configs/mx6cuboxi.h | 12 ++++++++++++
|
||||
2 files changed, 19 insertions(+)
|
||||
|
||||
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
||||
index 285588d..59a78df 100644
|
||||
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
||||
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/errno.h>
|
||||
#include <asm/gpio.h>
|
||||
#include <asm/imx-common/iomux-v3.h>
|
||||
+#include <asm/imx-common/sata.h>
|
||||
#include <asm/imx-common/video.h>
|
||||
#include <mmc.h>
|
||||
#include <fsl_esdhc.h>
|
||||
@@ -314,6 +315,12 @@ int board_early_init_f(void)
|
||||
ret = setup_display();
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_CMD_SATA
|
||||
+ /* Only mx6q/mx6q has SATA */
|
||||
+ if (is_mx6dq())
|
||||
+ setup_sata();
|
||||
+#endif
|
||||
+
|
||||
#ifdef CONFIG_USB_EHCI_MX6
|
||||
setup_usb();
|
||||
#endif
|
||||
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
|
||||
index 2782911..cec626a 100644
|
||||
--- a/include/configs/mx6cuboxi.h
|
||||
+++ b/include/configs/mx6cuboxi.h
|
||||
@@ -21,6 +21,17 @@
|
||||
/* MMC Configs */
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
|
||||
|
||||
+/* SATA Configuration */
|
||||
+#define CONFIG_CMD_SATA
|
||||
+#ifdef CONFIG_CMD_SATA
|
||||
+#define CONFIG_DWC_AHSATA
|
||||
+#define CONFIG_SYS_SATA_MAX_DEVICE 1
|
||||
+#define CONFIG_DWC_AHSATA_PORT_ID 0
|
||||
+#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR
|
||||
+#define CONFIG_LBA48
|
||||
+#define CONFIG_LIBATA
|
||||
+#endif
|
||||
+
|
||||
/* Ethernet Configuration */
|
||||
#define CONFIG_FEC_MXC
|
||||
#define CONFIG_MII
|
||||
@@ -119,6 +130,7 @@
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 0) \
|
||||
+ func(SATA, sata, 0) \
|
||||
func(USB, usb, 0) \
|
||||
func(PXE, pxe, na) \
|
||||
func(DHCP, dhcp, na)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (u-boot-2017.07.tar.bz2) = 821175dd414e1fd0e5b6d9293a5766cbc8ae63a2361e82309f67e92c02b881263a7832dba0bcfc820b036a582981ddc20a8f484f2995d110f3240907a3ff7a95
|
||||
SHA512 (u-boot-2017.09-rc1.tar.bz2) = 83ce6309013ea52c22a9b32d67c50d4b4e64b5f4fd3b396b36204274cdd16c0a3539ae473bf245cd64d3a86fff52b882a9b490378ccf63c4f8e04dcf3f4c4319
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,8 @@
|
||||
#global candidate rc3
|
||||
%global candidate rc1
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2017.07
|
||||
Release: 2%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2017.09
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
@ -13,17 +13,16 @@ Source2: arm-chromebooks
|
||||
Source3: aarch64-boards
|
||||
Source4: aarch64-chromebooks
|
||||
|
||||
# Fedoraisms patches, general fixes
|
||||
Patch1: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
Patch2: dragonboard-fixes.patch
|
||||
Patch3: mx6cuboxi-Add-support-for-sata.patch
|
||||
Patch4: mx6-Initial-Hummingboard-2-support.patch
|
||||
Patch5: uefi-fixes.patch
|
||||
Patch6: use-Fedora-specific-EFI-path-name.patch
|
||||
Patch7: net-Mark-the-ip_udp_hdr-struct-as-packed.patch
|
||||
Patch2: use-Fedora-specific-EFI-path-name.patch
|
||||
Patch3: net-Mark-the-ip_udp_hdr-struct-as-packed.patch
|
||||
|
||||
# Board fixes and enablement
|
||||
Patch10: dragonboard-fixes.patch
|
||||
Patch11: mx6-Initial-Hummingboard-2-support.patch
|
||||
Patch12: sti-STiH410-B2260-support.patch
|
||||
|
||||
# Patch11: sti-STiH410-B2260-support.patch
|
||||
# Patch12: AW64-add-spl-atf-support.patch
|
||||
# Patch13: arm-tegra-nyan-chromebook.patch
|
||||
# Patch14: 0001-arm-mvebu-enable-generic-distro-boot-config.patch
|
||||
|
||||
BuildRequires: bc
|
||||
@ -275,6 +274,10 @@ cp -p board/warp7/README builds/docs/README.warp7
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Aug 1 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2017.09-0.1.rc1
|
||||
- 2017.09 RC1
|
||||
- Initial patch rebase
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.07-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user