diff options
| -rw-r--r-- | src/mainboard/google/cosmos/memlayout.ld | 2 | ||||
| -rw-r--r-- | src/mainboard/google/cosmos/romstage.c | 19 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/i2c.c | 2 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/include/soc/i2c.h (renamed from src/soc/marvell/bg4cd/i2c.h) | 0 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/include/soc/memlayout.ld (renamed from src/soc/marvell/bg4cd/memlayout.ld) | 0 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/include/soc/sdram.h (renamed from src/soc/marvell/bg4cd/sdram.h) | 0 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/sdram.c | 2 |
8 files changed, 15 insertions, 12 deletions
diff --git a/src/mainboard/google/cosmos/memlayout.ld b/src/mainboard/google/cosmos/memlayout.ld index d788b78602..ead7f47838 100644 --- a/src/mainboard/google/cosmos/memlayout.ld +++ b/src/mainboard/google/cosmos/memlayout.ld @@ -1 +1 @@ -#include <soc/marvell/bg4cd/memlayout.ld> +#include <soc/memlayout.ld> diff --git a/src/mainboard/google/cosmos/romstage.c b/src/mainboard/google/cosmos/romstage.c index f3e98e0ed2..0c6472895c 100644 --- a/src/mainboard/google/cosmos/romstage.c +++ b/src/mainboard/google/cosmos/romstage.c @@ -17,21 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <types.h> +#include <arch/cache.h> +#include <arch/exception.h> +#include <arch/stages.h> #include <armv7.h> #include <cbfs.h> -#include <console/console.h> -#include <arch/stages.h> #include <cbmem.h> +#include <console/console.h> #include <delay.h> -#include <timestamp.h> -#include <arch/cache.h> -#include <arch/exception.h> -#include <stdlib.h> #include <program_loading.h> -#include <vendorcode/google/chromeos/chromeos.h> -#include <soc/marvell/bg4cd/sdram.h> +#include <soc/sdram.h> +#include <stdlib.h> #include <symbols.h> +#include <timestamp.h> +#include <types.h> +#include <vendorcode/google/chromeos/chromeos.h> + #include "timer.h" void main(void) diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc index af390d168b..18f9d8ddfe 100644 --- a/src/soc/marvell/bg4cd/Makefile.inc +++ b/src/soc/marvell/bg4cd/Makefile.inc @@ -37,6 +37,8 @@ ramstage-y += i2c.c ramstage-y += monotonic_timer.c ramstage-$(CONFIG_SPI_FLASH) += spi.c +CPPFLAGS_common += -Isrc/soc/marvell/bg4cd/include/ + $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf cp $< $@ diff --git a/src/soc/marvell/bg4cd/i2c.c b/src/soc/marvell/bg4cd/i2c.c index 1aa02d0689..16ad9abcf3 100644 --- a/src/soc/marvell/bg4cd/i2c.c +++ b/src/soc/marvell/bg4cd/i2c.c @@ -18,7 +18,7 @@ */ #include <device/i2c.h> -#include "i2c.h" +#include <soc/i2c.h> int platform_i2c_transfer(unsigned bus, struct i2c_seg *segments, int seg_count) { diff --git a/src/soc/marvell/bg4cd/i2c.h b/src/soc/marvell/bg4cd/include/soc/i2c.h index 40db31a9ee..40db31a9ee 100644 --- a/src/soc/marvell/bg4cd/i2c.h +++ b/src/soc/marvell/bg4cd/include/soc/i2c.h diff --git a/src/soc/marvell/bg4cd/memlayout.ld b/src/soc/marvell/bg4cd/include/soc/memlayout.ld index 45cf3950c3..45cf3950c3 100644 --- a/src/soc/marvell/bg4cd/memlayout.ld +++ b/src/soc/marvell/bg4cd/include/soc/memlayout.ld diff --git a/src/soc/marvell/bg4cd/sdram.h b/src/soc/marvell/bg4cd/include/soc/sdram.h index 6850d2752a..6850d2752a 100644 --- a/src/soc/marvell/bg4cd/sdram.h +++ b/src/soc/marvell/bg4cd/include/soc/sdram.h diff --git a/src/soc/marvell/bg4cd/sdram.c b/src/soc/marvell/bg4cd/sdram.c index 1b5575b08e..0ebee151fb 100644 --- a/src/soc/marvell/bg4cd/sdram.c +++ b/src/soc/marvell/bg4cd/sdram.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <console/console.h> -#include "sdram.h" +#include <soc/sdram.h> void sdram_init(void) { |