diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index c2eb2186ba..cffaca35f9 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -199,6 +199,11 @@ config TEGRA_SERIAL_CONSOLE depends on SERIAL_CONSOLE default n +config RK_SERIAL_CONSOLE + bool "Rockchip SOC serial port driver" + depends on SERIAL_CONSOLE + default n + config IPQ806X_SERIAL_CONSOLE bool "IPQ806x SOC compatible serial port driver" depends on SERIAL_CONSOLE @@ -382,6 +387,8 @@ config TIMER_TEGRA_1US config TIMER_IPQ806X bool "Timer for ipq806x platforms" +config TIMER_RK + bool "Timer for Rockchip" endchoice config TIMER_MCT_HZ @@ -394,6 +401,11 @@ config TIMER_MCT_ADDRESS depends on TIMER_MCT default 0x101c0000 +config TIMER_RK_ADDRESS + hex "Rockchip timer base address" + depends on TIMER_RK + default 0xff810020 + config TIMER_TEGRA_1US_ADDRESS hex "Tegra u1s timer base address" depends on TIMER_TEGRA_1US diff --git a/payloads/libpayload/configs/config.arm64-generic b/payloads/libpayload/configs/config.arm64-generic index b9e6ff3216..c4ebcb1da4 100644 --- a/payloads/libpayload/configs/config.arm64-generic +++ b/payloads/libpayload/configs/config.arm64-generic @@ -49,6 +49,7 @@ CONFIG_LP_TIMER_NONE=y # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_RK is not set CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y diff --git a/payloads/libpayload/configs/config.bayleybay b/payloads/libpayload/configs/config.bayleybay index 4686328d04..8cdcd44d06 100644 --- a/payloads/libpayload/configs/config.bayleybay +++ b/payloads/libpayload/configs/config.bayleybay @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.beltino b/payloads/libpayload/configs/config.beltino index 4686328d04..8cdcd44d06 100644 --- a/payloads/libpayload/configs/config.beltino +++ b/payloads/libpayload/configs/config.beltino @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.bolt b/payloads/libpayload/configs/config.bolt index ab8b9ec25a..94f006c891 100644 --- a/payloads/libpayload/configs/config.bolt +++ b/payloads/libpayload/configs/config.bolt @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.daisy b/payloads/libpayload/configs/config.daisy index 87f01904d3..43a11de50b 100644 --- a/payloads/libpayload/configs/config.daisy +++ b/payloads/libpayload/configs/config.daisy @@ -39,6 +39,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set CONFIG_LP_S5P_SERIAL_CONSOLE=y # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -55,6 +56,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y CONFIG_LP_TIMER_MCT=y # CONFIG_LP_TIMER_TEGRA_1US is not set # CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_RK is not set CONFIG_LP_TIMER_MCT_HZ=24000000 CONFIG_LP_TIMER_MCT_ADDRESS=0x101c0000 CONFIG_LP_USB=y diff --git a/payloads/libpayload/configs/config.falco b/payloads/libpayload/configs/config.falco index 9c9e90b4cd..fd80a8894c 100644 --- a/payloads/libpayload/configs/config.falco +++ b/payloads/libpayload/configs/config.falco @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.fox_baskingridge b/payloads/libpayload/configs/config.fox_baskingridge index c60457b306..b02017090f 100644 --- a/payloads/libpayload/configs/config.fox_baskingridge +++ b/payloads/libpayload/configs/config.fox_baskingridge @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.fox_wtm2 b/payloads/libpayload/configs/config.fox_wtm2 index fb52d5c66a..a0aa6eb8b3 100644 --- a/payloads/libpayload/configs/config.fox_wtm2 +++ b/payloads/libpayload/configs/config.fox_wtm2 @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.gizmo b/payloads/libpayload/configs/config.gizmo index f5932ff43c..0828f9653c 100644 --- a/payloads/libpayload/configs/config.gizmo +++ b/payloads/libpayload/configs/config.gizmo @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.link b/payloads/libpayload/configs/config.link index f5932ff43c..0828f9653c 100644 --- a/payloads/libpayload/configs/config.link +++ b/payloads/libpayload/configs/config.link @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.lumpy b/payloads/libpayload/configs/config.lumpy index 0fa78e8e16..3dcff79ee9 100644 --- a/payloads/libpayload/configs/config.lumpy +++ b/payloads/libpayload/configs/config.lumpy @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.nyan b/payloads/libpayload/configs/config.nyan index b5f62cf686..cf7747f0f3 100644 --- a/payloads/libpayload/configs/config.nyan +++ b/payloads/libpayload/configs/config.nyan @@ -39,6 +39,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -54,6 +55,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +# CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y diff --git a/payloads/libpayload/configs/config.nyan_big b/payloads/libpayload/configs/config.nyan_big index b5f62cf686..cf7747f0f3 100644 --- a/payloads/libpayload/configs/config.nyan_big +++ b/payloads/libpayload/configs/config.nyan_big @@ -39,6 +39,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -54,6 +55,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +# CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y diff --git a/payloads/libpayload/configs/config.nyan_blaze b/payloads/libpayload/configs/config.nyan_blaze index f929eff133..f447820fa8 100644 --- a/payloads/libpayload/configs/config.nyan_blaze +++ b/payloads/libpayload/configs/config.nyan_blaze @@ -39,6 +39,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -54,6 +55,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +# CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y diff --git a/payloads/libpayload/configs/config.panther b/payloads/libpayload/configs/config.panther index 1f34b72355..21f0d0d0a9 100644 --- a/payloads/libpayload/configs/config.panther +++ b/payloads/libpayload/configs/config.panther @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.peach_pit b/payloads/libpayload/configs/config.peach_pit index 888a144385..29331c48b4 100644 --- a/payloads/libpayload/configs/config.peach_pit +++ b/payloads/libpayload/configs/config.peach_pit @@ -39,6 +39,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set CONFIG_LP_S5P_SERIAL_CONSOLE=y # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -54,6 +55,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set CONFIG_LP_TIMER_MCT=y # CONFIG_LP_TIMER_TEGRA_1US is not set +# CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_MCT_HZ=24000000 CONFIG_LP_TIMER_MCT_ADDRESS=0x101c0000 diff --git a/payloads/libpayload/configs/config.peppy b/payloads/libpayload/configs/config.peppy index 14e074fd0d..af101fb3d6 100644 --- a/payloads/libpayload/configs/config.peppy +++ b/payloads/libpayload/configs/config.peppy @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.rambi b/payloads/libpayload/configs/config.rambi index bf0dafc680..c2a0a536f3 100644 --- a/payloads/libpayload/configs/config.rambi +++ b/payloads/libpayload/configs/config.rambi @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.rush b/payloads/libpayload/configs/config.rush index 4deacc4f68..3cab84e0b8 100644 --- a/payloads/libpayload/configs/config.rush +++ b/payloads/libpayload/configs/config.rush @@ -54,6 +54,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +# CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y diff --git a/payloads/libpayload/configs/config.samus b/payloads/libpayload/configs/config.samus index 9c9b182cf7..2f156b5d40 100644 --- a/payloads/libpayload/configs/config.samus +++ b/payloads/libpayload/configs/config.samus @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.slippy b/payloads/libpayload/configs/config.slippy index 45d9a809ea..46024ebe3d 100644 --- a/payloads/libpayload/configs/config.slippy +++ b/payloads/libpayload/configs/config.slippy @@ -40,6 +40,7 @@ CONFIG_LP_SERIAL_CONSOLE=y CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 diff --git a/payloads/libpayload/configs/config.storm b/payloads/libpayload/configs/config.storm index b2733b188e..6723d54e0f 100644 --- a/payloads/libpayload/configs/config.storm +++ b/payloads/libpayload/configs/config.storm @@ -39,6 +39,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_RK_SERIAL_CONSOLE is not set CONFIG_LP_IPQ806X_SERIAL_CONSOLE=y # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -53,6 +54,7 @@ CONFIG_LP_IPQ806X_SERIAL_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set # CONFIG_LP_TIMER_TEGRA_1US is not set +# CONFIG_LP_TIMER_RK is not set CONFIG_LP_TIMER_IPQ806X=y CONFIG_LP_IPQ806X_TIMER_FREQ=32000 CONFIG_LP_IPQ806X_TIMER_REG=0x0200A008 diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron new file mode 100644 index 0000000000..e47bfd8a6d --- /dev/null +++ b/payloads/libpayload/configs/config.veyron @@ -0,0 +1,73 @@ +# +# Automatically generated make config: don't edit +# libpayload version: 0.2.0 +# Fri May 3 13:22:35 2013 +# + +# +# Generic Options +# +CONFIG_LP_GPL=y +# CONFIG_LP_EXPERIMENTAL is not set +# CONFIG_LP_OBSOLETE is not set +# CONFIG_LP_DEVELOPER is not set +CONFIG_LP_CHROMEOS=y + +# +# Architecture Options +# +CONFIG_LP_ARCH_ARM=y +# CONFIG_LP_ARCH_ARM64 is not set +# CONFIG_LP_ARCH_POWERPC is not set +# CONFIG_LP_ARCH_X86 is not set +# CONFIG_LP_MEMMAP_RAM_ONLY is not set + +# +# Standard Libraries +# +CONFIG_LP_LIBC=y +# CONFIG_LP_CURSES is not set +CONFIG_LP_CBFS=y +CONFIG_LP_LZMA=y + +# +# Console Options +# +CONFIG_LP_SKIP_CONSOLE_INIT=y +CONFIG_LP_CBMEM_CONSOLE=y +CONFIG_LP_SERIAL_CONSOLE=y +# CONFIG_LP_8250_SERIAL_CONSOLE is not set +CONFIG_LP_RK_SERIAL_CONSOLE=y +#CONFIG_LP_S5P_SERIAL_CONSOLE is not set +# CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set +# CONFIG_LP_SERIAL_SET_SPEED is not set +# CONFIG_LP_SERIAL_ACS_FALLBACK is not set +CONFIG_LP_VIDEO_CONSOLE=y +CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y +# CONFIG_LP_PC_KEYBOARD is not set + +# +# Drivers +# +# CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set +# CONFIG_LP_STORAGE is not set +CONFIG_LP_TIMER_RK=y +CONFIG_LP_TIMER_RK_ADDRESS=0xff810020 +# CONFIG_LP_TIMER_MCT is not set +# CONFIG_LP_TIMER_TEGRA_1US is not set +# CONFIG_LP_TIMER_IPQ806X is not set +# CONFIG_LP_TIMER_MCT_HZ is not set +CONFIG_LP_USB=y +# CONFIG_LP_USB_OHCI is not set +CONFIG_LP_USB_EHCI=y +# CONFIG_LP_USB_XHCI is not set +CONFIG_LP_USB_HID=y +CONFIG_LP_USB_HUB=y +CONFIG_LP_USB_MSC=y +# CONFIG_LP_USB_PCI is not set +CONFIG_LP_USB_GEN_HUB=y +# CONFIG_LP_BIG_ENDIAN is not set +CONFIG_LP_LITTLE_ENDIAN=y +# CONFIG_LP_IO_ADDRESS_SPACE is not set +CONFIG_LP_ARCH_SPECIFIC_OPTIONS=y diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index 48e4189b79..f22bd9f642 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -37,7 +37,7 @@ libc-$(CONFIG_LP_8250_SERIAL_CONSOLE) += serial/8250.c libc-$(CONFIG_LP_S5P_SERIAL_CONSOLE) += serial/s5p.c libc-$(CONFIG_LP_TEGRA_SERIAL_CONSOLE) += serial/tegra.c libc-$(CONFIG_LP_IPQ806X_SERIAL_CONSOLE) += serial/ipq806x.c - +libc-$(CONFIG_LP_RK_SERIAL_CONSOLE) += serial/rk_serial.c libc-$(CONFIG_LP_PC_KEYBOARD) += keyboard.c libc-$(CONFIG_LP_CBMEM_CONSOLE) += cbmem_console.c @@ -50,6 +50,7 @@ libc-$(CONFIG_LP_TIMER_MCT) += timer/mct.c libc-$(CONFIG_LP_TIMER_RDTSC) += timer/rdtsc.c libc-$(CONFIG_LP_TIMER_TEGRA_1US) += timer/tegra_1us.c libc-$(CONFIG_LP_TIMER_IPQ806X) += timer/ipq806x.c +libc-$(CONFIG_LP_TIMER_RK) += timer/rktimer.c # Video console drivers libc-$(CONFIG_LP_VIDEO_CONSOLE) += video/video.c diff --git a/payloads/libpayload/drivers/serial/rk_serial.c b/payloads/libpayload/drivers/serial/rk_serial.c new file mode 100644 index 0000000000..8c3f679b5c --- /dev/null +++ b/payloads/libpayload/drivers/serial/rk_serial.c @@ -0,0 +1,115 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Rockchip Electronics + * + * 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 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include +#include +struct rk_uart { + union { + u32 uart_thr; /*Transmit holding register.*/ + u32 uart_rbr; /*Receive buffer register.*/ + u32 uart_dll; /* Divisor latch lsb.*/ + }; + union { + u32 uart_ier; /*Interrupt enable register.*/ + u32 uart_dlh; /* Divisor latch msb.*/ + }; + union { + uint32_t uart_iir; /*Interrupt identification register.*/ + uint32_t uart_fcr; /* FIFO control register.*/ + }; + u32 uart_lcr; + u32 uart_mcr; + u32 uart_lsr; + u32 uart_msr; + u32 uart_scr; + u32 reserved1[(0x30 - 0x20) / 4]; + u32 uart_srbr[(0x70 - 0x30) / 4]; + u32 uart_far; + u32 uart_tfr; + u32 uart_rfw; + u32 uart_usr; + u32 uart_tfl; + u32 uart_rfl; + u32 uart_srr; + u32 uart_srts; + u32 uart_sbcr; + u32 uart_sdmam; + u32 uart_sfe; + u32 uart_srt; + u32 uart_stet; + u32 uart_htx; + u32 uart_dmasa; + u32 reserver2[(0xf4 - 0xac) / 4]; + u32 uart_cpr; + u32 uart_ucv; + u32 uart_ctr; +}; +enum { + UART_LSR_DR = 0x1 << 0, /*Data ready.*/ + UART_LSR_OE = 0x1 << 1, /*Overrun.*/ + UART_LSR_PE = 0x1 << 2, /*Parity error.*/ + UART_LSR_FE = 0x1 << 3, /*Framing error.*/ + UART_LSR_BI = 0x1 << 4, /*Break.*/ + UART_LSR_THRE = 0x1 << 5, /*Xmit holding register empty.*/ + UART_LSR_TEMT = 0x1 << 6, /*Xmitter empty.*/ + UART_LSR_ERR = 0x1 << 7 /* Error.*/ +}; + +static struct rk_uart *uart_regs; +void serial_putchar(unsigned int c) +{ + while (!(readl(&uart_regs->uart_lsr) & UART_LSR_THRE)); + writel((c&0xff), &uart_regs->uart_thr); + if (c == '\n') + serial_putchar('\r'); +} + +int serial_havechar(void) +{ + uint8_t lsr = readl(&uart_regs->uart_lsr); + return (lsr & UART_LSR_DR) == UART_LSR_DR; +} + +int serial_getchar(void) +{ + while (!serial_havechar()); + return readl(&uart_regs->uart_rbr)&0xff; +} + +static struct console_input_driver consin = { + .havekey = &serial_havechar, + .getchar = &serial_getchar +}; + +static struct console_output_driver consout = {.putchar = &serial_putchar +}; + +void serial_init(void) +{ + if (!lib_sysinfo.serial || !lib_sysinfo.serial->baseaddr) + return; + + uart_regs = (struct rk_uart *)lib_sysinfo.serial->baseaddr; +} + +void serial_console_init(void) +{ + serial_init(); + console_add_input_driver(&consin); + console_add_output_driver(&consout); +} diff --git a/payloads/libpayload/drivers/timer/rktimer.c b/payloads/libpayload/drivers/timer/rktimer.c new file mode 100644 index 0000000000..1634b77539 --- /dev/null +++ b/payloads/libpayload/drivers/timer/rktimer.c @@ -0,0 +1,44 @@ + +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Rockchip Electronics + * + * 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 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include +#include +#include +struct rk_timer { + u32 timer_load_count0; + u32 timer_load_count1; + u32 timer_curr_value0; + u32 timer_curr_value1; + u32 timer_ctrl_reg; + u32 timer_int_status; +}; +uint64_t timer_hz(void) +{ + return 24000000; +} +uint64_t timer_raw_value(void) +{ + uint64_t upper; + uint64_t lower; + struct rk_timer *rk_timer; + rk_timer = (struct rk_timer *)CONFIG_LP_TIMER_RK_ADDRESS; + lower = (uint64_t) rk_timer->timer_curr_value0; + upper = (uint64_t) rk_timer->timer_curr_value1; + return (upper << 32) | lower; +}