Copy u-boot sources as is and modify the tree to still build
This patch brings in ipq806x source files from the vendor's u-boot tree as it was published in the 'cs_banana' release. The following files are being copied: arch/arm/cpu/armv7/ipq/clock.c => src/soc/qualcomm/ipq806x/clock.c arch/arm/cpu/armv7/ipq/gpio.c => src/soc/qualcomm/ipq806x/gpio.c arch/arm/cpu/armv7/ipq/timer.c => src/soc/qualcomm/ipq806x/timer.c arch/arm/include/asm/arch-ipq806x/clock.h => src/soc/qualcomm/ipq806x/clock.h arch/arm/include/asm/arch-ipq806x/gpio.h => src/soc/qualcomm/ipq806x/gpio.h arch/arm/include/asm/arch-ipq806x/gsbi.h => src/soc/qualcomm/ipq806x/gsbi.h arch/arm/include/asm/arch-ipq806x/iomap.h => src/soc/qualcomm/ipq806x/iomap.h arch/arm/include/asm/arch-ipq806x/timer.h src/soc/qualcomm/ipq806x/timer.h arch/arm/include/asm/arch-ipq806x/uart.h => src/soc/qualcomm/ipq806x/uart.h board/qcom/ipq806x_cdp/ipq806x_cdp.c => src/mainboard/google/storm/cdp.c board/qcom/ipq806x_cdp/ipq806x_cdp.h => src/soc/qualcomm/ipq8064/cdp.h drivers/serial/ipq806x_uart.c => src/console/ipq806x_console.c Note that local timer.c gets overwritten with the original version. To prevent a build breakage some shortly to be reverted modifications had to be made to src/soc/qualcomm/ipq806x/Makefile.inc and src/soc/qualcomm/ipq806x/cbfs.c. BRANCH=none BUG=chrome-os-partner:27784 TEST='emerge-storm coreboot' still succeeds Original-Change-Id: I3f50bfbec2e18a3b5d2c640cff353a26f88c98c1 Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/193722 Original-Reviewed-by: David Hendricks <dhendrix@chromium.org> (cherry picked from commit 3c9c2ede7e97e330cad2c2f3e557cc9bcdaecdcc) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: Ia7bc66cecfc16f1dd4a9f3cb9840cbe91878adf4 Reviewed-on: http://review.coreboot.org/7263 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Vadim Bendebury
committed by
Marc Jones
Marc Jones
parent
9cb70ae31f
commit
476f7316a1
@@ -1,28 +1,139 @@
|
||||
/*
|
||||
* This file is part of the coreboot project.
|
||||
* Copyright (c) 2012 - 2013 The Linux Foundation. All rights reserved.
|
||||
* Source : APQ8064 LK boot
|
||||
*
|
||||
* Copyright 2013 Google Inc.
|
||||
* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Google, Inc. nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this
|
||||
* software without specific prior written permission.
|
||||
*
|
||||
* 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
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <console/console.h>
|
||||
#include <timer.h>
|
||||
#include <delay.h>
|
||||
#include <thread.h>
|
||||
#include <asm/arch-ipq806x/iomap.h>
|
||||
#include <asm/io.h>
|
||||
#include <common.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/arch-ipq806x/timer.h>
|
||||
|
||||
void init_timer(void)
|
||||
static ulong timestamp;
|
||||
static ulong lastinc;
|
||||
|
||||
#define GPT_FREQ_KHZ 32
|
||||
#define GPT_FREQ (GPT_FREQ_KHZ * 1000) /* 32 KHz */
|
||||
|
||||
/**
|
||||
* timer_init - initialize timer
|
||||
*/
|
||||
int timer_init(void)
|
||||
{
|
||||
writel(0, GPT_ENABLE);
|
||||
writel(GPT_ENABLE_EN, GPT_ENABLE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* get_timer - returns time lapsed
|
||||
* @base: base/start time
|
||||
*
|
||||
* Returns time lapsed, since the specified base time value.
|
||||
*/
|
||||
ulong get_timer(ulong base)
|
||||
{
|
||||
return get_timer_masked() - base;
|
||||
}
|
||||
|
||||
/**
|
||||
* __udelay - generates micro second delay.
|
||||
* @usec: delay duration in microseconds
|
||||
*
|
||||
* With 32KHz clock, minimum possible delay is 31.25 Micro seconds and
|
||||
* its multiples. In Rumi GPT clock is 32 KHz
|
||||
*/
|
||||
void __udelay(unsigned long usec)
|
||||
{
|
||||
unsigned int val;
|
||||
ulong now, last;
|
||||
ulong runcount;
|
||||
|
||||
usec = (usec + GPT_FREQ_KHZ - 1) / GPT_FREQ_KHZ;
|
||||
last = readl(GPT_COUNT_VAL);
|
||||
runcount = last;
|
||||
val = usec + last;
|
||||
|
||||
do {
|
||||
now = readl(GPT_COUNT_VAL);
|
||||
if (last > now)
|
||||
runcount += ((GPT_FREQ - last) + now);
|
||||
else
|
||||
runcount += (now - last);
|
||||
last = now;
|
||||
} while (runcount < val);
|
||||
}
|
||||
|
||||
|
||||
inline ulong gpt_to_sys_freq(unsigned int gpt)
|
||||
{
|
||||
/*
|
||||
* get_timer() expects the timer increments to be in terms
|
||||
* of CONFIG_SYS_HZ. Convert GPT timer values to CONFIG_SYS_HZ
|
||||
* units.
|
||||
*/
|
||||
return (((ulong)gpt) / (GPT_FREQ / CONFIG_SYS_HZ));
|
||||
}
|
||||
|
||||
/**
|
||||
* get_timer_masked - returns current ticks
|
||||
*
|
||||
* Returns the current timer ticks, since boot.
|
||||
*/
|
||||
ulong get_timer_masked(void)
|
||||
{
|
||||
ulong now = gpt_to_sys_freq(readl(GPT_COUNT_VAL));
|
||||
|
||||
if (lastinc <= now) { /* normal mode (non roll) */
|
||||
/* normal mode */
|
||||
timestamp += now - lastinc;
|
||||
/* move stamp forward with absolute diff ticks */
|
||||
} else { /* we have overflow of the count down timer */
|
||||
timestamp += now + (TIMER_LOAD_VAL - lastinc);
|
||||
}
|
||||
|
||||
lastinc = now;
|
||||
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
unsigned long long get_ticks(void)
|
||||
{
|
||||
return readl(GPT_COUNT_VAL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Return the number of timer ticks per second.
|
||||
*/
|
||||
ulong get_tbclk(void)
|
||||
{
|
||||
return GPT_FREQ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user