diff options
21 files changed, 30 insertions, 28 deletions
diff --git a/src/mainboard/google/storm/boardid.c b/src/mainboard/google/storm/boardid.c index 683b5f4812..a8dd84439b 100644 --- a/src/mainboard/google/storm/boardid.c +++ b/src/mainboard/google/storm/boardid.c @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> #include <boardid.h> #include <gpiolib.h> #include <console/console.h> +#include <stdlib.h> /* * Storm boards dedicate to the board ID three GPIOs in tertiary mode: 29, 30 diff --git a/src/mainboard/google/storm/cdp.c b/src/mainboard/google/storm/cdp.c index 94845c7322..7e1aeb66ad 100644 --- a/src/mainboard/google/storm/cdp.c +++ b/src/mainboard/google/storm/cdp.c @@ -1,9 +1,9 @@ /* * Copyright (c) 2012 - 2013 The Linux Foundation. All rights reserved.* */ +#include <soc/gpio.h> +#include <soc/cdp.h> #include <types.h> -#include <cdp.h> -#include <gpio.h> void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned count) { diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c index 478e2a8b8d..acadce5b2a 100644 --- a/src/mainboard/google/storm/mainboard.c +++ b/src/mainboard/google/storm/mainboard.c @@ -24,13 +24,12 @@ #include <delay.h> #include <device/device.h> #include <gpiolib.h> +#include <soc/clock.h> +#include <soc/gpio.h> +#include <soc/usb.h> #include <string.h> #include <symbols.h> -#include <soc/qualcomm/ipq806x/include/clock.h> -#include <soc/qualcomm/ipq806x/include/gpio.h> -#include <soc/qualcomm/ipq806x/include/usb.h> - /* convenient shorthand (in MB) */ #define DRAM_START ((uintptr_t)_dram / MiB) #define DRAM_SIZE (CONFIG_DRAM_SIZE_MB) diff --git a/src/mainboard/google/storm/memlayout.ld b/src/mainboard/google/storm/memlayout.ld index 1735835321..ead7f47838 100644 --- a/src/mainboard/google/storm/memlayout.ld +++ b/src/mainboard/google/storm/memlayout.ld @@ -1 +1 @@ -#include <soc/qualcomm/ipq806x/memlayout.ld> +#include <soc/memlayout.ld> diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc index 5dfca4d7ad..6ee925c2b2 100644 --- a/src/soc/qualcomm/ipq806x/Makefile.inc +++ b/src/soc/qualcomm/ipq806x/Makefile.inc @@ -40,6 +40,8 @@ ramstage-y += timer.c ramstage-$(CONFIG_DRIVERS_UART) += uart.c ramstage-y += usb.c +INCLUDES += -Isrc/soc/qualcomm/ipq806x/include/ + ifeq ($(CONFIG_USE_BLOBS),y) # Generate the actual coreboot bootblock code diff --git a/src/soc/qualcomm/ipq806x/clock.c b/src/soc/qualcomm/ipq806x/clock.c index ee2ed64ffb..fe7cfb83a8 100644 --- a/src/soc/qualcomm/ipq806x/clock.c +++ b/src/soc/qualcomm/ipq806x/clock.c @@ -3,8 +3,8 @@ */ #include <delay.h> +#include <soc/clock.h> #include <types.h> -#include <clock.h> /** * uart_pll_vote_clk_enable - enables PLL8 diff --git a/src/soc/qualcomm/ipq806x/gpio.c b/src/soc/qualcomm/ipq806x/gpio.c index 8cce3ba735..46dca4e3c3 100644 --- a/src/soc/qualcomm/ipq806x/gpio.c +++ b/src/soc/qualcomm/ipq806x/gpio.c @@ -28,9 +28,9 @@ * SUCH DAMAGE. */ -#include <iomap.h> -#include <gpio.h> #include <arch/io.h> +#include <soc/gpio.h> +#include <soc/iomap.h> /******************************************************* Function description: check for invalid GPIO # diff --git a/src/soc/qualcomm/ipq806x/include/cdp.h b/src/soc/qualcomm/ipq806x/include/soc/cdp.h index 15f91cb169..c7de23f4e8 100644 --- a/src/soc/qualcomm/ipq806x/include/cdp.h +++ b/src/soc/qualcomm/ipq806x/include/soc/cdp.h @@ -4,6 +4,8 @@ #ifndef _IPQ806X_CDP_H_ #define _IPQ806X_CDP_H_ +#include <types.h> + unsigned smem_get_board_machtype(void); typedef enum { diff --git a/src/soc/qualcomm/ipq806x/include/clock.h b/src/soc/qualcomm/ipq806x/include/soc/clock.h index d9e783479c..837b831680 100644 --- a/src/soc/qualcomm/ipq806x/include/clock.h +++ b/src/soc/qualcomm/ipq806x/include/soc/clock.h @@ -33,7 +33,7 @@ #ifndef __IPQ860X_CLOCK_H_ #define __IPQ860X_CLOCK_H_ -#include <iomap.h> +#include <soc/iomap.h> /* UART clock @ 7.3728 MHz */ #define UART_DM_CLK_RX_TX_BIT_RATE 0xCC diff --git a/src/soc/qualcomm/ipq806x/include/gpio.h b/src/soc/qualcomm/ipq806x/include/soc/gpio.h index 276022c0af..276022c0af 100644 --- a/src/soc/qualcomm/ipq806x/include/gpio.h +++ b/src/soc/qualcomm/ipq806x/include/soc/gpio.h diff --git a/src/soc/qualcomm/ipq806x/include/gsbi.h b/src/soc/qualcomm/ipq806x/include/soc/gsbi.h index c12d6fd7b4..c12d6fd7b4 100644 --- a/src/soc/qualcomm/ipq806x/include/gsbi.h +++ b/src/soc/qualcomm/ipq806x/include/soc/gsbi.h diff --git a/src/soc/qualcomm/ipq806x/include/iomap.h b/src/soc/qualcomm/ipq806x/include/soc/iomap.h index c9c8fc413a..ad7056e0fe 100644 --- a/src/soc/qualcomm/ipq806x/include/iomap.h +++ b/src/soc/qualcomm/ipq806x/include/soc/iomap.h @@ -37,7 +37,7 @@ #define __SOC_QUALCOMM_IPQ806X_IOMAP_H_ #include <arch/io.h> -#include <cdp.h> +#include <soc/cdp.h> /* Typecast to allow integers being passed as address This needs to be included because vendor code is not compliant with our diff --git a/src/soc/qualcomm/ipq806x/include/ipq_timer.h b/src/soc/qualcomm/ipq806x/include/soc/ipq_timer.h index 4e1ef34294..4e1ef34294 100644 --- a/src/soc/qualcomm/ipq806x/include/ipq_timer.h +++ b/src/soc/qualcomm/ipq806x/include/soc/ipq_timer.h diff --git a/src/soc/qualcomm/ipq806x/include/ipq_uart.h b/src/soc/qualcomm/ipq806x/include/soc/ipq_uart.h index 90ca7047a2..90ca7047a2 100644 --- a/src/soc/qualcomm/ipq806x/include/ipq_uart.h +++ b/src/soc/qualcomm/ipq806x/include/soc/ipq_uart.h diff --git a/src/soc/qualcomm/ipq806x/memlayout.ld b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld index de1b12935c..de1b12935c 100644 --- a/src/soc/qualcomm/ipq806x/memlayout.ld +++ b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld diff --git a/src/soc/qualcomm/ipq806x/include/spi.h b/src/soc/qualcomm/ipq806x/include/soc/spi.h index f7dda07a51..f7dda07a51 100644 --- a/src/soc/qualcomm/ipq806x/include/spi.h +++ b/src/soc/qualcomm/ipq806x/include/soc/spi.h diff --git a/src/soc/qualcomm/ipq806x/include/usb.h b/src/soc/qualcomm/ipq806x/include/soc/usb.h index c3c4c48ce9..c3c4c48ce9 100644 --- a/src/soc/qualcomm/ipq806x/include/usb.h +++ b/src/soc/qualcomm/ipq806x/include/soc/usb.h diff --git a/src/soc/qualcomm/ipq806x/spi.c b/src/soc/qualcomm/ipq806x/spi.c index 54d54b244f..4cf64ebadc 100644 --- a/src/soc/qualcomm/ipq806x/spi.c +++ b/src/soc/qualcomm/ipq806x/spi.c @@ -4,11 +4,11 @@ #include <arch/io.h> #include <delay.h> +#include <soc/gpio.h> +#include <soc/iomap.h> +#include <soc/spi.h> #include <stdlib.h> #include <string.h> -#include <spi.h> -#include <gpio.h> -#include <iomap.h> #define SUCCESS 0 diff --git a/src/soc/qualcomm/ipq806x/timer.c b/src/soc/qualcomm/ipq806x/timer.c index 55386e949b..f52f2efdc8 100644 --- a/src/soc/qualcomm/ipq806x/timer.c +++ b/src/soc/qualcomm/ipq806x/timer.c @@ -29,8 +29,8 @@ */ #include <delay.h> -#include <iomap.h> -#include <ipq_timer.h> +#include <soc/iomap.h> +#include <soc/ipq_timer.h> #include <timer.h> /* diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c index 4989247f33..3e8e187fde 100644 --- a/src/soc/qualcomm/ipq806x/uart.c +++ b/src/soc/qualcomm/ipq806x/uart.c @@ -34,12 +34,12 @@ #include <arch/io.h> #include <boot/coreboot_tables.h> #include <console/console.h> -#include <delay.h> -#include <clock.h> -#include <gpio.h> -#include <gsbi.h> #include <console/uart.h> -#include <ipq_uart.h> +#include <delay.h> +#include <soc/clock.h> +#include <soc/gpio.h> +#include <soc/gsbi.h> +#include <soc/ipq_uart.h> #include <stdint.h> #include <stdlib.h> diff --git a/src/soc/qualcomm/ipq806x/usb.c b/src/soc/qualcomm/ipq806x/usb.c index a9214be022..fb89373953 100644 --- a/src/soc/qualcomm/ipq806x/usb.c +++ b/src/soc/qualcomm/ipq806x/usb.c @@ -17,13 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <delay.h> #include <arch/io.h> #include <console/console.h> - -#include "clock.h" -#include "iomap.h" -#include "usb.h" +#include <delay.h> +#include <soc/clock.h> +#include <soc/iomap.h> +#include <soc/usb.h> #define CRPORT_TX_OVRD_DRV_LO 0x1002 #define CRPORT_RX_OVRD_IN_HI 0x1006 |