11 files changed, 11 insertions, 11 deletions
diff --git a/src/soc/amd/cezanne/aoac.c b/src/soc/amd/cezanne/aoac.c
index c313a55b5f..14758e0da4 100644
--- a/src/soc/amd/cezanne/aoac.c
+++ b/src/soc/amd/cezanne/aoac.c
@@ -23,7 +23,7 @@
  *
  * TODO: Find out which I2C controllers we really need to enable here.
  */
-const static unsigned int aoac_devs[] = {
+static const unsigned int aoac_devs[] = {
 	FCH_AOAC_DEV_AMBA,
 	FCH_AOAC_DEV_I2C0,
 	FCH_AOAC_DEV_I2C1,
diff --git a/src/soc/amd/cezanne/fch.c b/src/soc/amd/cezanne/fch.c
index 1ceb8bc7b9..0936c5e255 100644
--- a/src/soc/amd/cezanne/fch.c
+++ b/src/soc/amd/cezanne/fch.c
@@ -29,7 +29,7 @@
  * amd_pci_int_defs.h, just add the pair at the end of this table.
  * Order is not important.
  */
-const static struct irq_idx_name irq_association[] = {
+static const struct irq_idx_name irq_association[] = {
 	{ PIRQ_A,	"INTA#" },
 	{ PIRQ_B,	"INTB#" },
 	{ PIRQ_C,	"INTC#" },
diff --git a/src/soc/amd/glinda/aoac.c b/src/soc/amd/glinda/aoac.c
index 9cb9c1a0e2..ab3ec59c1e 100644
--- a/src/soc/amd/glinda/aoac.c
+++ b/src/soc/amd/glinda/aoac.c
@@ -28,7 +28,7 @@
  *
  * TODO: Find out which I2C controllers we really need to enable here.
  */
-const static unsigned int aoac_devs[] = {
+static const unsigned int aoac_devs[] = {
 	FCH_AOAC_DEV_AMBA,
 	FCH_AOAC_DEV_I2C0,
 	FCH_AOAC_DEV_I2C1,
diff --git a/src/soc/amd/glinda/fch.c b/src/soc/amd/glinda/fch.c
index ea196c0af1..af5f0ecf28 100644
--- a/src/soc/amd/glinda/fch.c
+++ b/src/soc/amd/glinda/fch.c
@@ -25,7 +25,7 @@
  * amd_pci_int_defs.h, just add the pair at the end of this table.
  * Order is not important.
  */
-const static struct irq_idx_name irq_association[] = {
+static const struct irq_idx_name irq_association[] = {
 	{ PIRQ_A,	"INTA#" },
 	{ PIRQ_B,	"INTB#" },
 	{ PIRQ_C,	"INTC#" },
diff --git a/src/soc/amd/mendocino/aoac.c b/src/soc/amd/mendocino/aoac.c
index ab52544189..d63ca62587 100644
--- a/src/soc/amd/mendocino/aoac.c
+++ b/src/soc/amd/mendocino/aoac.c
@@ -26,7 +26,7 @@
  *
  * TODO: Find out which I2C controllers we really need to enable here.
  */
-const static unsigned int aoac_devs[] = {
+static const unsigned int aoac_devs[] = {
 	FCH_AOAC_DEV_AMBA,
 	FCH_AOAC_DEV_I2C0,
 	FCH_AOAC_DEV_I2C1,
diff --git a/src/soc/amd/mendocino/fch.c b/src/soc/amd/mendocino/fch.c
index 4427ab6fa3..d7c488bf67 100644
--- a/src/soc/amd/mendocino/fch.c
+++ b/src/soc/amd/mendocino/fch.c
@@ -24,7 +24,7 @@
  * amd_pci_int_defs.h, just add the pair at the end of this table.
  * Order is not important.
  */
-const static struct irq_idx_name irq_association[] = {
+static const struct irq_idx_name irq_association[] = {
 	{ PIRQ_A,	"INTA#" },
 	{ PIRQ_B,	"INTB#" },
 	{ PIRQ_C,	"INTC#" },
diff --git a/src/soc/amd/phoenix/aoac.c b/src/soc/amd/phoenix/aoac.c
index ab52544189..d63ca62587 100644
--- a/src/soc/amd/phoenix/aoac.c
+++ b/src/soc/amd/phoenix/aoac.c
@@ -26,7 +26,7 @@
  *
  * TODO: Find out which I2C controllers we really need to enable here.
  */
-const static unsigned int aoac_devs[] = {
+static const unsigned int aoac_devs[] = {
 	FCH_AOAC_DEV_AMBA,
 	FCH_AOAC_DEV_I2C0,
 	FCH_AOAC_DEV_I2C1,
diff --git a/src/soc/amd/phoenix/fch.c b/src/soc/amd/phoenix/fch.c
index 7e265338df..91df79e35a 100644
--- a/src/soc/amd/phoenix/fch.c
+++ b/src/soc/amd/phoenix/fch.c
@@ -24,7 +24,7 @@
  * amd_pci_int_defs.h, just add the pair at the end of this table.
  * Order is not important.
  */
-const static struct irq_idx_name irq_association[] = {
+static const struct irq_idx_name irq_association[] = {
 	{ PIRQ_A,	"INTA#" },
 	{ PIRQ_B,	"INTB#" },
 	{ PIRQ_C,	"INTC#" },
diff --git a/src/soc/amd/picasso/aoac.c b/src/soc/amd/picasso/aoac.c
index 13d6be4976..a191032c22 100644
--- a/src/soc/amd/picasso/aoac.c
+++ b/src/soc/amd/picasso/aoac.c
@@ -23,7 +23,7 @@
  * waiting for each device to become available, a single delay will be
  * executed.  The console UART is handled separately from this table.
  */
-const static unsigned int aoac_devs[] = {
+static const unsigned int aoac_devs[] = {
 	FCH_AOAC_DEV_AMBA,
 	FCH_AOAC_DEV_I2C2,
 	FCH_AOAC_DEV_I2C3,
diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c
index e364a48419..a1eef6f534 100644
--- a/src/soc/amd/picasso/fch.c
+++ b/src/soc/amd/picasso/fch.c
@@ -31,7 +31,7 @@
  * amd_pci_int_defs.h, just add the pair at the end of this table.
  * Order is not important.
  */
-const static struct irq_idx_name irq_association[] = {
+static const struct irq_idx_name irq_association[] = {
 	{ PIRQ_A,	"INTA#" },
 	{ PIRQ_B,	"INTB#" },
 	{ PIRQ_C,	"INTC#" },
diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c
index a540c3cadf..4da2333edc 100644
--- a/src/soc/samsung/exynos5250/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5250/alternate_cbfs.c
@@ -92,7 +92,7 @@ static int sdmmc_cbfs_open(void)
 	return 0;
 }
 
-const static struct mem_region_device alternate_rdev =
+static const struct mem_region_device alternate_rdev =
 	MEM_REGION_DEV_RO_INIT(_cbfs_cache, REGION_SIZE(cbfs_cache));
 
 const struct region_device *boot_device_ro(void)