[U-Boot] [PATCH v3 39/42] common: Move pci_init_board() out of common.h

This function can be dropped when all boards use driver model for PCI. For now, move it into init.h with a comment.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v3: None Changes in v2: None

board/armltd/integrator/pci.c | 1 + board/cavium/thunderx/thunderx.c | 1 + board/esd/vme8349/pci.c | 1 + board/freescale/b4860qds/pci.c | 1 + board/freescale/common/p_corenet/pci.c | 1 + board/freescale/m54455evb/m54455evb.c | 1 + board/freescale/m547xevb/m547xevb.c | 1 + board/freescale/m548xevb/m548xevb.c | 1 + board/freescale/mpc8308rdb/mpc8308rdb.c | 1 + board/freescale/mpc8315erdb/mpc8315erdb.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/freescale/mpc832xemds/pci.c | 1 + board/freescale/mpc8349emds/pci.c | 1 + board/freescale/mpc8349itx/pci.c | 1 + board/freescale/mpc837xemds/pci.c | 1 + board/freescale/mpc837xerdb/pci.c | 1 + board/freescale/mpc8541cds/mpc8541cds.c | 1 + board/freescale/mpc8544ds/mpc8544ds.c | 1 + board/freescale/mpc8548cds/mpc8548cds.c | 1 + board/freescale/mpc8555cds/mpc8555cds.c | 1 + board/freescale/mpc8568mds/mpc8568mds.c | 1 + board/freescale/mpc8610hpcd/mpc8610hpcd.c | 1 + board/freescale/mpc8641hpcn/mpc8641hpcn.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 1 + board/freescale/t102xqds/pci.c | 1 + board/freescale/t102xrdb/pci.c | 1 + board/freescale/t1040qds/pci.c | 1 + board/freescale/t104xrdb/pci.c | 1 + board/freescale/t208xqds/pci.c | 1 + board/freescale/t208xrdb/pci.c | 1 + board/freescale/t4qds/pci.c | 1 + board/freescale/t4rdb/pci.c | 1 + board/gdsys/mpc8308/hrcon.c | 1 + board/gdsys/mpc8308/strider.c | 1 + board/imgtec/malta/malta.c | 1 + board/keymile/kmp204x/pci.c | 1 + board/mpc8308_p1m/mpc8308_p1m.c | 1 + board/renesas/r7780mp/r7780mp.c | 1 + board/sbc8349/pci.c | 1 + board/sbc8548/sbc8548.c | 1 + board/sbc8641d/sbc8641d.c | 1 + board/tqc/tqm834x/pci.c | 1 + board/varisys/cyrus/pci.c | 1 + board/ve8313/ve8313.c | 1 + board/xes/common/fsl_8xxx_pci.c | 1 + drivers/pci/pci.c | 1 + drivers/pci/pcie_imx.c | 1 + include/common.h | 2 -- include/init.h | 3 +++ 49 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/board/armltd/integrator/pci.c b/board/armltd/integrator/pci.c index 5e57f7f4c9..c189d23eec 100644 --- a/board/armltd/integrator/pci.c +++ b/board/armltd/integrator/pci.c @@ -20,6 +20,7 @@ * Linus Walleij linus.walleij@linaro.org */ #include <common.h> +#include <init.h> #include <pci.h> #include <asm/io.h> #include "integrator-sc.h" diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c index cf55b633c3..940455de5b 100644 --- a/board/cavium/thunderx/thunderx.c +++ b/board/cavium/thunderx/thunderx.c @@ -5,6 +5,7 @@

#include <common.h> #include <dm.h> +#include <init.h> #include <malloc.h> #include <errno.h> #include <linux/compiler.h> diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c index 82347f258c..349e7b567c 100644 --- a/board/esd/vme8349/pci.c +++ b/board/esd/vme8349/pci.c @@ -10,6 +10,7 @@ * Based on MPC8349 PCI support but w/o PIB related code. */

+#include <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/b4860qds/pci.c b/board/freescale/b4860qds/pci.c index 3663b14bc3..45dd461e77 100644 --- a/board/freescale/b4860qds/pci.c +++ b/board/freescale/b4860qds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c index a6abe66dc0..94e4715f1c 100644 --- a/board/freescale/common/p_corenet/pci.c +++ b/board/freescale/common/p_corenet/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c index 98af3be595..146cd918c4 100644 --- a/board/freescale/m54455evb/m54455evb.c +++ b/board/freescale/m54455evb/m54455evb.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c index 9e1aa99bbc..e8d86113d6 100644 --- a/board/freescale/m547xevb/m547xevb.c +++ b/board/freescale/m547xevb/m547xevb.c @@ -9,6 +9,7 @@

#include <config.h> #include <common.h> +#include <init.h> #include <pci.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c index b491518468..40e01c6f24 100644 --- a/board/freescale/m548xevb/m548xevb.c +++ b/board/freescale/m548xevb/m548xevb.c @@ -9,6 +9,7 @@

#include <config.h> #include <common.h> +#include <init.h> #include <pci.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c index fc29e2f0dc..ae73246e5b 100644 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c @@ -7,6 +7,7 @@ #include <common.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <spi.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index 84b85f8b10..93e0fca083 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -9,6 +9,7 @@ #include <common.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <pci.h> diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index 003e95cb6b..cbec8a44e4 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -11,6 +11,7 @@

#include <common.h> #include <env.h> +#include <init.h> #include <ioports.h> #include <mpc83xx.h> #include <i2c.h> diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c index d94269a6ea..45c7294832 100644 --- a/board/freescale/mpc832xemds/pci.c +++ b/board/freescale/mpc832xemds/pci.c @@ -6,6 +6,7 @@ /* * PCI Configuration space access support for MPC83xx PCI Bridge */ +#include <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c index 005190ed87..7615a1dfaa 100644 --- a/board/freescale/mpc8349emds/pci.c +++ b/board/freescale/mpc8349emds/pci.c @@ -3,6 +3,7 @@ * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. */

+#include <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c index c3c2328dcd..550a2afcb7 100644 --- a/board/freescale/mpc8349itx/pci.c +++ b/board/freescale/mpc8349itx/pci.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h>

#include <asm/mmu.h> #include <asm/io.h> diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 41b78cf5e4..c72e49fbe1 100644 --- a/board/freescale/mpc837xemds/pci.c +++ b/board/freescale/mpc837xemds/pci.c @@ -3,6 +3,7 @@ * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. */

+#include <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c index 38954587ab..07471e0ae5 100644 --- a/board/freescale/mpc837xerdb/pci.c +++ b/board/freescale/mpc837xerdb/pci.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <mpc83xx.h> #include <pci.h> #include <asm/io.h> diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index be79a7ca7b..cb130b4a86 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <vsprintf.h> #include <asm/processor.h> diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index dbfa80a216..2d4aace98d 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 28f8a998ce..a4455d3f61 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <vsprintf.h> #include <asm/processor.h> diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index bc1ebc51ed..47193dd20e 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <vsprintf.h> #include <asm/processor.h> diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index dd2d15ea00..5167f81be7 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 5c8538fa1d..86edd66bca 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index ea4f3d670b..d9e538b868 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index 6814bed27c..e582065975 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -7,6 +7,7 @@ #include <command.h> #include <cpu_legacy.h> #include <env.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/t102xqds/pci.c b/board/freescale/t102xqds/pci.c index 4100370e20..1b1cc0483c 100644 --- a/board/freescale/t102xqds/pci.c +++ b/board/freescale/t102xqds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c index adc128d924..bd0e29744c 100644 --- a/board/freescale/t102xrdb/pci.c +++ b/board/freescale/t102xrdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t1040qds/pci.c b/board/freescale/t1040qds/pci.c index 9fd66594f4..5152cdf18a 100644 --- a/board/freescale/t1040qds/pci.c +++ b/board/freescale/t1040qds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c index 6b666ba2d2..ff7cf36446 100644 --- a/board/freescale/t104xrdb/pci.c +++ b/board/freescale/t104xrdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c index ef26f14c46..e335592776 100644 --- a/board/freescale/t208xqds/pci.c +++ b/board/freescale/t208xqds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c index adc128d924..bd0e29744c 100644 --- a/board/freescale/t208xrdb/pci.c +++ b/board/freescale/t208xrdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t4qds/pci.c b/board/freescale/t4qds/pci.c index 4860ab6ed1..26e2a0af4a 100644 --- a/board/freescale/t4qds/pci.c +++ b/board/freescale/t4qds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c index 7d670e1a2f..ac0c95687a 100644 --- a/board/freescale/t4rdb/pci.c +++ b/board/freescale/t4rdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c index 60faa4688c..d1110157a2 100644 --- a/board/gdsys/mpc8308/hrcon.c +++ b/board/gdsys/mpc8308/hrcon.c @@ -8,6 +8,7 @@ #include <env.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <spi.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c index 886bc2b035..9ba9e4278a 100644 --- a/board/gdsys/mpc8308/strider.c +++ b/board/gdsys/mpc8308/strider.c @@ -8,6 +8,7 @@ #include <env.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <spi.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c index b742e3738f..77ce75ecf2 100644 --- a/board/imgtec/malta/malta.c +++ b/board/imgtec/malta/malta.c @@ -6,6 +6,7 @@

#include <common.h> #include <ide.h> +#include <init.h> #include <netdev.h> #include <pci.h> #include <pci_gt64120.h> diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c index 965a8ce98b..a8047457f2 100644 --- a/board/keymile/kmp204x/pci.c +++ b/board/keymile/kmp204x/pci.c @@ -8,6 +8,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index ab724da0d2..5b2fd9c23f 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -6,6 +6,7 @@

#include <common.h> #include <i2c.h> +#include <init.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <pci.h> diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c index e2c5c5ba93..8dbeeb6e68 100644 --- a/board/renesas/r7780mp/r7780mp.c +++ b/board/renesas/r7780mp/r7780mp.c @@ -6,6 +6,7 @@

#include <common.h> #include <ide.h> +#include <init.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/pci.h> diff --git a/board/sbc8349/pci.c b/board/sbc8349/pci.c index b173c9c502..b6435f34f2 100644 --- a/board/sbc8349/pci.c +++ b/board/sbc8349/pci.c @@ -7,6 +7,7 @@ * Based on MPC8349 PCI support but w/o PIB related code. */

+#include <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 0c36ded862..d246dce36d 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index fb5db6c93d..0a9dab8939 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -13,6 +13,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c index c9b05e44c2..0834207766 100644 --- a/board/tqc/tqm834x/pci.c +++ b/board/tqc/tqm834x/pci.c @@ -5,6 +5,7 @@ * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. */

+#include <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c index a2df928fc5..66c4b30eb1 100644 --- a/board/varisys/cyrus/pci.c +++ b/board/varisys/cyrus/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c index 1559ff210d..781a07f1d8 100644 --- a/board/ve8313/ve8313.c +++ b/board/ve8313/ve8313.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <init.h> #include <linux/libfdt.h> #include <pci.h> #include <mpc83xx.h> diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c index 84ca4d1215..9981d04c62 100644 --- a/board/xes/common/fsl_8xxx_pci.c +++ b/board/xes/common/fsl_8xxx_pci.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <asm/fsl_serdes.h> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5db24f1c51..e8285bf936 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -15,6 +15,7 @@ */

#include <common.h> +#include <init.h>

#include <command.h> #include <env.h> diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 10b8fb4c88..d53d6298bf 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> diff --git a/include/common.h b/include/common.h index 3001296ff2..a292d91939 100644 --- a/include/common.h +++ b/include/common.h @@ -102,8 +102,6 @@ int do_fat_fsload(cmd_tbl_t *, int, int, char * const []); /* common/cmd_ext2.c */ int do_ext2load(cmd_tbl_t *, int, int, char * const []);

-void pci_init_board(void); - /* common/exports.c */ void jumptable_init(void);

diff --git a/include/init.h b/include/init.h index e506cd30dd..3b45e631fc 100644 --- a/include/init.h +++ b/include/init.h @@ -205,6 +205,9 @@ int board_late_init(void); int board_postclk_init(void); /* after clocks/timebase, before env/serial */ int board_early_init_r(void);

+/* TODO(sjg@chromium.org): Drop this when DM_PCI migration is completed */ +void pci_init_board(void); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */