aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-01-31 13:20:06 +0100
committerWolfgang Denk <wd@denx.de>2008-02-07 01:12:57 +0100
commit4a995edec1ac163d9326d143ffe2b47e7543407f (patch)
treef69ac1a596c3eadb1e9db93c5b5c678d26b804f7
parent7582438c285bf0cef82909d0f232de64ec567a8a (diff)
downloadu-boot-4a995edec1ac163d9326d143ffe2b47e7543407f.zip
u-boot-4a995edec1ac163d9326d143ffe2b47e7543407f.tar.gz
u-boot-4a995edec1ac163d9326d143ffe2b47e7543407f.tar.bz2
[new uImage] Rename architecture specific bootm code files
Implementation of the do_bootm_linux() and other bootm helper routines is architecture specific code. As such it resides in lib_<arch> directories in files named <arch>_linux.c This patch renames those files to a more clear and accurate lib_<arch>/bootm.c form. List of the renamed files: lib_arm/armlinux.c -> lib_arm/bootm.c lib_avr32/avr32_linux.c -> lib_avr32/bootm.c lib_blackfin/bf533_linux.c -> lib_blackfin/bootm.c lib_i386/i386_linux.c -> lib_i386/bootm.c lib_m68k/m68k_linux.c -> lib_m68k/bootm.c lib_microblaze/microblaze_linux.c -> lib_microblaze/bootm.c lib_mips/mips_linux.c -> lib_mips/bootm.c lib_nios/nios_linux.c -> lib_nios/bootm.c lib_nios2/nios_linux.c -> lib_nios2/bootm.c lib_ppc/ppc_linux.c -> lib_ppc/bootm.c lib_sh/sh_linux.c -> lib_sh/bootm.c Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat
-rw-r--r--lib_arm/Makefile2
-rw-r--r--lib_arm/bootm.c (renamed from lib_arm/armlinux.c)0
-rw-r--r--lib_avr32/Makefile2
-rw-r--r--lib_avr32/bootm.c (renamed from lib_avr32/avr32_linux.c)0
-rw-r--r--lib_blackfin/Makefile2
-rw-r--r--lib_blackfin/bootm.c (renamed from lib_blackfin/bf533_linux.c)0
-rw-r--r--lib_i386/Makefile2
-rw-r--r--lib_i386/bootm.c (renamed from lib_i386/i386_linux.c)0
-rw-r--r--lib_m68k/Makefile2
-rw-r--r--lib_m68k/bootm.c (renamed from lib_m68k/m68k_linux.c)0
-rw-r--r--lib_microblaze/Makefile2
-rw-r--r--lib_microblaze/bootm.c (renamed from lib_microblaze/microblaze_linux.c)0
-rw-r--r--lib_mips/Makefile2
-rw-r--r--lib_mips/bootm.c (renamed from lib_mips/mips_linux.c)0
-rw-r--r--lib_nios/Makefile2
-rw-r--r--lib_nios/bootm.c (renamed from lib_nios/nios_linux.c)0
-rw-r--r--lib_nios2/Makefile2
-rw-r--r--lib_nios2/bootm.c (renamed from lib_nios2/nios_linux.c)0
-rw-r--r--lib_ppc/Makefile2
-rw-r--r--lib_ppc/bootm.c (renamed from lib_ppc/ppc_linux.c)0
-rw-r--r--lib_sh/Makefile2
-rw-r--r--lib_sh/bootm.c (renamed from lib_sh/sh_linux.c)0
22 files changed, 11 insertions, 11 deletions
diff --git a/lib_arm/Makefile b/lib_arm/Makefile
index 037c475..aa9bee7 100644
--- a/lib_arm/Makefile
+++ b/lib_arm/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = _ashldi3.o _ashrdi3.o _divsi3.o _modsi3.o _udivsi3.o _umodsi3.o
-COBJS = armlinux.o board.o \
+COBJS = bootm.o board.o \
cache.o div0.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/lib_arm/armlinux.c b/lib_arm/bootm.c
index 4f9aae6..4f9aae6 100644
--- a/lib_arm/armlinux.c
+++ b/lib_arm/bootm.c
diff --git a/lib_avr32/Makefile b/lib_avr32/Makefile
index bb2938f..ebe237b 100644
--- a/lib_avr32/Makefile
+++ b/lib_avr32/Makefile
@@ -29,7 +29,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = memset.o
-COBJS = board.o interrupts.o avr32_linux.o
+COBJS = board.o interrupts.o bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_avr32/avr32_linux.c b/lib_avr32/bootm.c
index 455590e..455590e 100644
--- a/lib_avr32/avr32_linux.c
+++ b/lib_avr32/bootm.c
diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile
index a7aaef7..ac3fb28 100644
--- a/lib_blackfin/Makefile
+++ b/lib_blackfin/Makefile
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = memcpy.o memcmp.o memset.o memmove.o
-COBJS = post.o tests.o board.o bf533_linux.o bf533_string.o cache.o muldi3.o
+COBJS = post.o tests.o board.o bootm.o bf533_string.o cache.o muldi3.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_blackfin/bf533_linux.c b/lib_blackfin/bootm.c
index 6299415..6299415 100644
--- a/lib_blackfin/bf533_linux.c
+++ b/lib_blackfin/bootm.c
diff --git a/lib_i386/Makefile b/lib_i386/Makefile
index e344da5..ef0ba54 100644
--- a/lib_i386/Makefile
+++ b/lib_i386/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = bios.o bios_pci.o realmode_switch.o
-COBJS = board.o bios_setup.o i386_linux.o zimage.o realmode.o \
+COBJS = board.o bios_setup.o bootm.o zimage.o realmode.o \
pci_type1.o pci.o video_bios.o video.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/lib_i386/i386_linux.c b/lib_i386/bootm.c
index 27a2b0d..27a2b0d 100644
--- a/lib_i386/i386_linux.c
+++ b/lib_i386/bootm.c
diff --git a/lib_m68k/Makefile b/lib_m68k/Makefile
index 03784fd..d515223 100644
--- a/lib_m68k/Makefile
+++ b/lib_m68k/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = cache.o traps.o time.o interrupts.o board.o m68k_linux.o
+COBJS = cache.o traps.o time.o interrupts.o board.o bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_m68k/m68k_linux.c b/lib_m68k/bootm.c
index b135556..b135556 100644
--- a/lib_m68k/m68k_linux.c
+++ b/lib_m68k/bootm.c
diff --git a/lib_microblaze/Makefile b/lib_microblaze/Makefile
index 82b7bea..9b317a2 100644
--- a/lib_microblaze/Makefile
+++ b/lib_microblaze/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o microblaze_linux.o time.o cache.o
+COBJS = board.o bootm.o time.o cache.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_microblaze/microblaze_linux.c b/lib_microblaze/bootm.c
index a4fce5a..a4fce5a 100644
--- a/lib_microblaze/microblaze_linux.c
+++ b/lib_microblaze/bootm.c
diff --git a/lib_mips/Makefile b/lib_mips/Makefile
index 3163f00..93cca7a 100644
--- a/lib_mips/Makefile
+++ b/lib_mips/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o time.o mips_linux.o
+COBJS = board.o time.o bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_mips/mips_linux.c b/lib_mips/bootm.c
index 7ea7571..7ea7571 100644
--- a/lib_mips/mips_linux.c
+++ b/lib_mips/bootm.c
diff --git a/lib_nios/Makefile b/lib_nios/Makefile
index 7c9d62c..d8ae7bd 100644
--- a/lib_nios/Makefile
+++ b/lib_nios/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o cache.o divmod.o nios_linux.o mult.o time.o
+COBJS = board.o cache.o divmod.o bootm.o mult.o time.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_nios/nios_linux.c b/lib_nios/bootm.c
index 55f7e3a..55f7e3a 100644
--- a/lib_nios/nios_linux.c
+++ b/lib_nios/bootm.c
diff --git a/lib_nios2/Makefile b/lib_nios2/Makefile
index 1ff2f29..5f996d3 100644
--- a/lib_nios2/Makefile
+++ b/lib_nios2/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS = cache.o
-COBJS = board.o divmod.o nios_linux.o mult.o time.o
+COBJS = board.o divmod.o bootm.o mult.o time.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_nios2/nios_linux.c b/lib_nios2/bootm.c
index cb84324..cb84324 100644
--- a/lib_nios2/nios_linux.c
+++ b/lib_nios2/bootm.c
diff --git a/lib_ppc/Makefile b/lib_ppc/Makefile
index 2aa0154..6845ed0 100644
--- a/lib_ppc/Makefile
+++ b/lib_ppc/Makefile
@@ -29,7 +29,7 @@ SOBJS = ppcstring.o ticks.o
COBJS = board.o \
bat_rw.o cache.o extable.o kgdb.o time.o interrupts.o \
- ppc_linux.o
+ bootm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_ppc/ppc_linux.c b/lib_ppc/bootm.c
index 3911687..3911687 100644
--- a/lib_ppc/ppc_linux.c
+++ b/lib_ppc/bootm.c
diff --git a/lib_sh/Makefile b/lib_sh/Makefile
index cf127a8..edb03d0 100644
--- a/lib_sh/Makefile
+++ b/lib_sh/Makefile
@@ -24,7 +24,7 @@ LIB = $(obj)lib$(ARCH).a
SOBJS =
-COBJS = board.o sh_linux.o # time.o
+COBJS = board.o bootm.o # time.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/lib_sh/sh_linux.c b/lib_sh/bootm.c
index 14b6815..14b6815 100644
--- a/lib_sh/sh_linux.c
+++ b/lib_sh/bootm.c
generated by cgit v1.1 at 2024-10-17 15:37:34 +0000
s="hl opt">) UINT16(0x006a) UINT16(0x0100) )) ATTRIBUTE(PFILE_DESC_LIST, LIST( LIST(UUID128(HID_PROFILE_ID) UINT16(0x0100)) )) ATTRIBUTE(DOC_URL, URL("http://bellard.org/qemu/user-doc.html")) ATTRIBUTE(SVCNAME_PRIMARY, STRING("QEMU Bluetooth HID")) ATTRIBUTE(SVCDESC_PRIMARY, STRING("QEMU Keyboard/Mouse")) ATTRIBUTE(SVCPROV_PRIMARY, STRING("QEMU " QEMU_VERSION)) /* Profile specific */ ATTRIBUTE(DEVICE_RELEASE_NUMBER, UINT16(0x0091)) /* Deprecated, remove */ ATTRIBUTE(PARSER_VERSION, UINT16(0x0111)) /* TODO: extract from l2cap_device->device.class[0] */ ATTRIBUTE(DEVICE_SUBCLASS, UINT8(0x40)) ATTRIBUTE(COUNTRY_CODE, UINT8(0x15)) ATTRIBUTE(VIRTUAL_CABLE, TRUE) ATTRIBUTE(RECONNECT_INITIATE, FALSE) /* TODO: extract from hid->usbdev->report_desc */ ATTRIBUTE(DESCRIPTOR_LIST, LIST( LIST(UINT8(0x22) ARRAY( 0x05, 0x01, /* Usage Page (Generic Desktop) */ 0x09, 0x06, /* Usage (Keyboard) */ 0xa1, 0x01, /* Collection (Application) */ 0x75, 0x01, /* Report Size (1) */ 0x95, 0x08, /* Report Count (8) */ 0x05, 0x07, /* Usage Page (Key Codes) */ 0x19, 0xe0, /* Usage Minimum (224) */ 0x29, 0xe7, /* Usage Maximum (231) */ 0x15, 0x00, /* Logical Minimum (0) */ 0x25, 0x01, /* Logical Maximum (1) */ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ 0x95, 0x01, /* Report Count (1) */ 0x75, 0x08, /* Report Size (8) */ 0x81, 0x01, /* Input (Constant) */ 0x95, 0x05, /* Report Count (5) */ 0x75, 0x01, /* Report Size (1) */ 0x05, 0x08, /* Usage Page (LEDs) */ 0x19, 0x01, /* Usage Minimum (1) */ 0x29, 0x05, /* Usage Maximum (5) */ 0x91, 0x02, /* Output (Data, Variable, Absolute) */ 0x95, 0x01, /* Report Count (1) */ 0x75, 0x03, /* Report Size (3) */ 0x91, 0x01, /* Output (Constant) */ 0x95, 0x06, /* Report Count (6) */ 0x75, 0x08, /* Report Size (8) */ 0x15, 0x00, /* Logical Minimum (0) */ 0x25, 0xff, /* Logical Maximum (255) */ 0x05, 0x07, /* Usage Page (Key Codes) */ 0x19, 0x00, /* Usage Minimum (0) */ 0x29, 0xff, /* Usage Maximum (255) */ 0x81, 0x00, /* Input (Data, Array) */ 0xc0 /* End Collection */ )))) ATTRIBUTE(LANG_ID_BASE_LIST, LIST( LIST(UINT16(0x0409) UINT16(0x0100)) )) ATTRIBUTE(SDP_DISABLE, FALSE) ATTRIBUTE(BATTERY_POWER, TRUE) ATTRIBUTE(REMOTE_WAKEUP, TRUE) ATTRIBUTE(BOOT_DEVICE, TRUE) /* XXX: untested */ ATTRIBUTE(SUPERVISION_TIMEOUT, UINT16(0x0c80)) ATTRIBUTE(NORMALLY_CONNECTABLE, TRUE) ATTRIBUTE(PROFILE_VERSION, UINT16(0x0100)) ) SERVICE(sdp, ATTRIBUTE(RECORD_HANDLE, UINT32(0)) /* Filled in later */ ATTRIBUTE(SVCLASS_ID_LIST, LIST(UUID128(SDP_SERVER_SVCLASS_ID))) ATTRIBUTE(RECORD_STATE, UINT32(1)) ATTRIBUTE(PROTO_DESC_LIST, LIST( LIST(UUID128(L2CAP_UUID) UINT16(BT_PSM_SDP)) LIST(UUID128(SDP_UUID)) )) ATTRIBUTE(BROWSE_GRP_LIST, LIST(UUID128(0x1002))) ATTRIBUTE(LANG_BASE_ATTR_ID_LIST, LIST( UINT16(0x656e) UINT16(0x006a) UINT16(0x0100) )) ATTRIBUTE(PFILE_DESC_LIST, LIST( LIST(UUID128(SDP_SERVER_PROFILE_ID) UINT16(0x0100)) )) ATTRIBUTE(DOC_URL, URL("http://bellard.org/qemu/user-doc.html")) ATTRIBUTE(SVCPROV_PRIMARY, STRING("QEMU " QEMU_VERSION)) /* Profile specific */ ATTRIBUTE(VERSION_NUM_LIST, LIST(UINT16(0x0100))) ATTRIBUTE(SVCDB_STATE , UINT32(1)) ) SERVICE(pnp, ATTRIBUTE(RECORD_HANDLE, UINT32(0)) /* Filled in later */ ATTRIBUTE(SVCLASS_ID_LIST, LIST(UUID128(PNP_INFO_SVCLASS_ID))) ATTRIBUTE(RECORD_STATE, UINT32(1)) ATTRIBUTE(PROTO_DESC_LIST, LIST( LIST(UUID128(L2CAP_UUID) UINT16(BT_PSM_SDP)) LIST(UUID128(SDP_UUID)) )) ATTRIBUTE(BROWSE_GRP_LIST, LIST(UUID128(0x1002))) ATTRIBUTE(LANG_BASE_ATTR_ID_LIST, LIST( UINT16(0x656e) UINT16(0x006a) UINT16(0x0100) )) ATTRIBUTE(PFILE_DESC_LIST, LIST( LIST(UUID128(PNP_INFO_PROFILE_ID) UINT16(0x0100)) )) ATTRIBUTE(DOC_URL, URL("http://bellard.org/qemu/user-doc.html")) ATTRIBUTE(SVCPROV_PRIMARY, STRING("QEMU " QEMU_VERSION)) /* Profile specific */ ATTRIBUTE(SPECIFICATION_ID, UINT16(0x0100)) ATTRIBUTE(VERSION, UINT16(0x0100)) ATTRIBUTE(PRIMARY_RECORD, TRUE) ) static int bt_l2cap_sdp_new_ch(struct bt_l2cap_device_s *dev, struct bt_l2cap_conn_params_s *params) { struct bt_l2cap_sdp_state_s *sdp = qemu_mallocz(sizeof(*sdp)); struct sdp_def_service_s *services[] = { &sdp_service_sdp_s, &sdp_service_hid_s, &sdp_service_pnp_s, NULL, }; sdp->channel = params; sdp->channel->opaque = sdp; sdp->channel->close = bt_l2cap_sdp_close_ch; sdp->channel->sdu_in = bt_l2cap_sdp_sdu_in; sdp_service_db_build(sdp, services); return 0; } void bt_l2cap_sdp_init(struct bt_l2cap_device_s *dev) { bt_l2cap_psm_register(dev, BT_PSM_SDP, MAX_PDU_OUT_SIZE, bt_l2cap_sdp_new_ch); }
generated by cgit v1.1 at 2024-10-17 15:37:34 +0000