Skip to content
Snippets Groups Projects
  1. Nov 28, 2017
  2. Nov 27, 2017
  3. Nov 26, 2017
    • Tom Rini's avatar
      Merge git://git.denx.de/u-boot-rockchip · 0931b6f2
      Tom Rini authored
      0931b6f2
    • Philipp Tomsich's avatar
      rockchip: defconfig: puma-rk3399: bypass ADC-based boot_mode check · e5ee24dd
      Philipp Tomsich authored
      
      The boot (and fallback/emergency boot) concept for the RK3399-Q7
      differs from Rockchip's reference platforms.
      
      On the RK3399-Q7, some of this functionality is present in the
      bootloader itself (and configurable); some is backed in hardware by
      the Qseven BIOS_DISABLE signal to invoke the final stages of fallbacks
      (i.e. either an external boot bypassing on-module memories or falling
      back to the BROM for USB recovery).
      
      In summary: the ADC-based boot_mode check does not apply for the
      RK3399-Q7 and we therefore disable it (in this commit) by setting
      CONFIG_BOOT_MODE_REG to 0.
      
      Signed-off-by: Philipp Tomsich's avatarPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
      e5ee24dd
    • Philipp Tomsich's avatar
      rockchip: fix turning off boot-mode via Kconfig · f07d76c0
      Philipp Tomsich authored
      
      The ROCKCHIP_BOOT_MODE_REG option defaults to a hex value, so 0 will
      show as 0x0 if a default is provided and changed via Kconfig.
      However, it still will show as 0, if no default is given.
      
      Consequently, the "is set to something other than 0" test in a
      Makefile is cumbersome.  Instead this check can easily be performed in
      the C-code.
      
      This removes the ifeq-check from mach-rockchip/Makefile, adds a
      matching #if-check to boot_mode.c and fixes resulting link issues (if
      boot_mode.o was not included due to the Makefile check) by defining a
      stub function (in case the functionality is not built in) for
      setup_boot_mode in boot_mode.c.
      
      Fixes: e3067793 (rockchip: make boot_mode related codes reused across all platforms)
      Signed-off-by: Philipp Tomsich's avatarPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
      f07d76c0
  4. Nov 25, 2017
Loading