merge mainline into yeeloongfw

diff --cc conf/mips-yeeloong.rmk
index aa3e96fa0368646e264930846299fb399599bfa7,9977f78815b6c529cd77bda8be5d44df4ba6f9ff..91a2283e8648aa31e7415fe861b3dc0c710a38db
--- 1/conf/mips-yeeloong.rmk
--- 2/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@@ -3,6 -3,9 +3,10 @@@ LINK_BASE = 0x8020000
  target_machine=yeeloong
  COMMON_CFLAGS += -march=mips3
  COMMON_ASFLAGS += -march=mips3
 -kernel_img_HEADERS += bitmap.h video.h gfxterm.h font.h bitmap_scale.h bufio.h
+ 
++kernel_img_HEADERS += bitmap.h video.h gfxterm.h font.h bitmap_scale.h bufio.h \
++      cs5536.h
+ 
  include $(srcdir)/conf/mips.mk
  
  pkglib_IMAGES = kernel.img
@@@ -23,6 -26,6 +27,7 @@@ kernel_img_SOURCES = kern/$(target_cpu)
        video/fb/fbfill.c video/fb/fbutil.c video/bitmap.c \
        video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
        term/gfxterm.c commands/extcmd.c lib/arg.c \
++      bus/cs5536.c \
        symlist.c
  kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
  kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
@@@ -81,17 -76,11 +86,17 @@@ datehook_mod_SOURCES = hook/datehook.
  datehook_mod_CFLAGS = $(COMMON_CFLAGS)
  datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
- # For cs5536.mod
- pkglib_MODULES += cs5536.mod
- cs5536_mod_SOURCES = bus/cs5536.c
- cs5536_mod_CFLAGS = $(COMMON_CFLAGS)
- cs5536_mod_LDFLAGS = $(COMMON_LDFLAGS)
 +# For lsspd.mod
 +pkglib_MODULES += lsspd.mod
 +lsspd_mod_SOURCES = commands/mips/yeeloong/lsspd.c
 +lsspd_mod_CFLAGS = $(COMMON_CFLAGS)
 +lsspd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 +
+ pkglib_MODULES += linux.mod
+ linux_mod_SOURCES = loader/$(target_cpu)/linux.c
+ linux_mod_CFLAGS = $(COMMON_CFLAGS)
+ linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
+ linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
  sbin_SCRIPTS += grub-install
  grub_install_SOURCES = util/grub-install.in

diff --cc include/grub/cs5536.h
index 51a21eb6e456053c6541fc6a45c9fc80423ee3ee,0000000000000000000000000000000000000000..3f06bdb68c674451e9f08c39e53d1f40bc7aacec
mode 100644,000000..100644
--- 1/include/grub/cs5536.h
--- /dev/null
+++ b/include/grub/cs5536.h
@@@ -1,77 -1,0 +1,79 @@@
- int grub_cs5536_find (grub_pci_device_t *devp);
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2010  Free Software Foundation, Inc.
 + *
 + *  GRUB is free software: you can redistribute it and/or modify
 + *  it under the terms of the GNU General Public License as published by
 + *  the Free Software Foundation, either version 3 of the License, or
 + *  (at your option) any later version.
 + *
 + *  GRUB is distributed in the hope that it will be useful,
 + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *  GNU General Public License for more details.
 + *
 + *  You should have received a copy of the GNU General Public License
 + *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 + */
 +
 +#ifndef GRUB_CS5536_HEADER
 +#define GRUB_CS5536_HEADER 1
 +
 +#ifndef ASM_FILE
 +#include <grub/pci.h>
 +#include <grub/err.h>
 +#include <grub/smbus.h>
 +#endif
 +
 +#define GRUB_CS5536_PCIID 0x208f1022
 +#define GRUB_CS5536_MSR_MAILBOX_ADDR  0xf4
 +#define GRUB_CS5536_MSR_MAILBOX_DATA0 0xf8
 +#define GRUB_CS5536_MSR_MAILBOX_DATA1 0xfc
 +#define GRUB_CS5536_MSR_SMB_BAR 0x8000000b
 +#define GRUB_CS5536_MSR_GPIO_BAR 0x8000000c
 +#define GRUB_CS5536_SMB_REG_DATA 0x0
 +#define GRUB_CS5536_SMB_REG_STATUS 0x1
 +#define GRUB_CS5536_SMB_REG_STATUS_SDAST (1 << 6)
 +#define GRUB_CS5536_SMB_REG_STATUS_BER (1 << 5)
 +#define GRUB_CS5536_SMB_REG_STATUS_NACK (1 << 4)
 +#define GRUB_CS5536_SMB_REG_CTRL1 0x3
 +#define GRUB_CS5536_SMB_REG_CTRL1_START 0x01
 +#define GRUB_CS5536_SMB_REG_CTRL1_STOP  0x02
 +#define GRUB_CS5536_SMB_REG_CTRL1_ACK   0x10
 +#define GRUB_CS5536_SMB_REG_ADDR 0x4
 +#define GRUB_CS5536_SMB_REG_ADDR_MASTER 0x0
 +#define GRUB_CS5536_SMB_REG_CTRL2 0x5
 +#define GRUB_CS5536_SMB_REG_CTRL2_ENABLE 0x1
 +#define GRUB_CS5536_SMB_REG_CTRL3 0x6
 +
 +#define GRUB_CS5536_LBAR_ADDR_MASK 0x000000000000fff8ULL
 +#define GRUB_CS5536_LBAR_ENABLE 0x0000000100000000ULL
 +
 +/* PMON-compatible LBARs.  */
 +#define GRUB_CS5536_LBAR_GPIO      0x0b000
 +#define GRUB_CS5536_LBAR_SMBUS     0x0b390
 +
 +#define GRUB_GPIO_SMBUS_PINS ((1 << 14) | (1 << 15))
 +#define GRUB_GPIO_REG_OUT_EN 0x4
 +#define GRUB_GPIO_REG_OUT_AUX1 0x10
 +#define GRUB_GPIO_REG_IN_EN 0x20
 +#define GRUB_GPIO_REG_IN_AUX1 0x34
 +
 +#ifndef ASM_FILE
- grub_err_t grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
-                                struct grub_smbus_spd *res);
++int EXPORT_FUNC (grub_cs5536_find) (grub_pci_device_t *devp);
 +
 +grub_uint64_t grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr);
 +void grub_cs5536_write_msr (grub_pci_device_t dev, grub_uint32_t addr,
 +                          grub_uint64_t val);
 +grub_err_t grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
 +                                    grub_uint8_t addr, grub_uint8_t *res);
- grub_err_t grub_cs5536_init_smbus (grub_pci_device_t dev, grub_uint16_t divisor,
-                                  grub_port_t *smbbase);
++grub_err_t EXPORT_FUNC (grub_cs5536_read_spd) (grub_port_t smbbase,
++                                             grub_uint8_t dev,
++                                             struct grub_smbus_spd *res);
 +grub_err_t grub_cs5536_smbus_wait (grub_port_t smbbase);
++grub_err_t EXPORT_FUNC (grub_cs5536_init_smbus) (grub_pci_device_t dev,
++                                               grub_uint16_t divisor,
++                                               grub_port_t *smbbase);
 +#endif
 +
 +#endif

diff --cc util/grub-mkrawimage.c
Simple merge