Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
authorTom Rini <trini@konsulko.com>
Mon, 30 Jul 2018 20:02:29 +0000 (16:02 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 30 Jul 2018 20:02:29 +0000 (16:02 -0400)
Patch queue for efi - 2018-07-25

Highlights this time:

  - Many small fixes to improve spec compatibility (found by SCT)
  - Almost enough to run with sandbox target
  - GetTime() improvements
  - Enable EFI_LOADER and HYP entry on ARMv7 with NONSEC=y

1  2 
MAINTAINERS
drivers/rtc/mc146818.c

diff --combined MAINTAINERS
index e44280ceb6d2502d2077537ba825d01235fd5588,988fb1a2f7ad175b22b9fd58a26c35ccf363a49f..fe8423530c10c04287c47c52a1870e5156436737
@@@ -368,6 -368,7 +368,7 @@@ F: doc/README.iscs
  F:    include/efi*
  F:    include/pe.h
  F:    include/asm-generic/pe.h
+ F:    lib/charset.c
  F:    lib/efi*/
  F:    test/py/tests/test_efi*
  F:    cmd/bootefi.c
@@@ -437,8 -438,8 +438,8 @@@ T: git git://git.denx.de/u-boot-mmc.gi
  F:    drivers/mmc/
  
  NAND FLASH
 -M:    Scott Wood <oss@buserror.net>
 -S:    Maintained
 +#M:   Scott Wood <oss@buserror.net>
 +S:    Orphaned (Since 2018-07)
  T:    git git://git.denx.de/u-boot-nand-flash.git
  F:    drivers/mtd/nand/
  
diff --combined drivers/rtc/mc146818.c
index 4df443d84aa931b27b7dfe3a39244fbe0f04c8df,744c0f4d757635b595a88162cfb69d06ad958a89..b98c39d8219cc4714ad47713c81a7fdd59fc8fb1
@@@ -19,8 -19,6 +19,6 @@@
  #define out8(p, v) outb(v, p)
  #endif
  
- #if defined(CONFIG_CMD_DATE)
  /* Set this to 1 to clear the CMOS RAM */
  #define CLEAR_CMOS            0
  
@@@ -145,8 -143,7 +143,8 @@@ static int mc146818_set(struct rtc_tim
  
        mc146818_write8(RTC_YEAR, bin2bcd(tmp->tm_year % 100));
        mc146818_write8(RTC_MONTH, bin2bcd(tmp->tm_mon));
 -      mc146818_write8(RTC_DAY_OF_WEEK, bin2bcd(tmp->tm_wday));
 +      /* Sunday = 1, Saturday = 7 */
 +      mc146818_write8(RTC_DAY_OF_WEEK, bin2bcd(tmp->tm_wday + 1));
        mc146818_write8(RTC_DATE_OF_MONTH, bin2bcd(tmp->tm_mday));
        mc146818_write8(RTC_HOURS, bin2bcd(tmp->tm_hour));
        mc146818_write8(RTC_MINUTES, bin2bcd(tmp->tm_min));
@@@ -196,7 -193,6 +194,6 @@@ static void mc146818_init(void
        /* Clear any pending interrupts */
        mc146818_read8(RTC_CONFIG_C);
  }
- #endif /* CONFIG_CMD_DATE */
  
  #ifdef CONFIG_DM_RTC